diff --git a/src/CADShared/Algorithms/QuadTree/Rect.cs b/src/CADShared/Algorithms/QuadTree/Rect.cs
index 1366442ee833adbd4aa9f6b84572abaa17637089..d771c19abe2e1b6bbfbc133d6bbecf0d068cbaf5 100644
--- a/src/CADShared/Algorithms/QuadTree/Rect.cs
+++ b/src/CADShared/Algorithms/QuadTree/Rect.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 namespace IFoxCAD.Cad;
diff --git a/src/CADShared/Basal/Nullable/ArgumentNullEx.cs b/src/CADShared/Basal/Nullable/ArgumentNullEx.cs
index 7fb7763d155fe169740d82758ebdd19763ac4f61..517cd14c8a7658d4c277fa82539de35f42b15ba3 100644
--- a/src/CADShared/Basal/Nullable/ArgumentNullEx.cs
+++ b/src/CADShared/Basal/Nullable/ArgumentNullEx.cs
@@ -1,5 +1,5 @@
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 namespace IFoxCAD.Basal;
 
 /// <summary>
diff --git a/src/CADShared/Basal/Nullable/CallerArgumentExpressionAttribute.cs b/src/CADShared/Basal/Nullable/CallerArgumentExpressionAttribute.cs
index e6f566041731582fb5e2e0544ff199d4024257b3..505d5ee5e07b9c01f80abc5accca7da62b51be2b 100644
--- a/src/CADShared/Basal/Nullable/CallerArgumentExpressionAttribute.cs
+++ b/src/CADShared/Basal/Nullable/CallerArgumentExpressionAttribute.cs
@@ -1,5 +1,5 @@
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 namespace System.Runtime.CompilerServices;
 /// <summary>
 /// 指示参数将为另一个参数传递的表达式捕获为字符串。
diff --git a/src/CADShared/Basal/Win/WindowsAPI.cs b/src/CADShared/Basal/Win/WindowsAPI.cs
index 5125d471e94c218224c4df83e8c5517ef2be4700..5b12ae2cc22560fc476fb352a8a9a4eddb6c1593 100644
--- a/src/CADShared/Basal/Win/WindowsAPI.cs
+++ b/src/CADShared/Basal/Win/WindowsAPI.cs
@@ -1,6 +1,6 @@
 #pragma warning disable CS1591 // 缺少对公共可见类型或成员的 XML 注释
 #define Marshal
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 namespace IFoxCAD.Basal;
diff --git a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs
index fcd40415e22b59d1d23038fd93070cd467fb77b5..cdeda3235a45a8008fbae8c737731395491d4793 100644
--- a/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs
+++ b/src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs
@@ -1,4 +1,4 @@
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/Entity/CurveEx.cs b/src/CADShared/ExtensionMethod/Entity/CurveEx.cs
index 14a51130884167c72f1099ce11dd0396dc90a847..0df06cde18045f47e8e36283ceba1ba07b32737f 100644
--- a/src/CADShared/ExtensionMethod/Entity/CurveEx.cs
+++ b/src/CADShared/ExtensionMethod/Entity/CurveEx.cs
@@ -1,6 +1,6 @@
 // ReSharper disable ForCanBeConvertedToForeach
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs b/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs
index f920a3cd0bf8aca0f3b82e8d8dd72a22119175e3..2a89e17409135e7fa89f6dd7e496cb484bc62bc5 100644
--- a/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs
+++ b/src/CADShared/ExtensionMethod/Geomerty/PointEx.cs
@@ -1,4 +1,4 @@
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs b/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs
index fe79a623bd4dda12f333b6cbab53c6ad20401976..eb17ddd55da15c25aecacec9eeab4502c262698c 100644
--- a/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs
+++ b/src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs
@@ -1,7 +1,7 @@
 // ReSharper disable CompareOfFloatsByEqualityOperator
 // ReSharper disable ForCanBeConvertedToForeach
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs b/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs
index f836615f30fabe9e69cd6f853899ebb89f4e6bad..b1d7576cbe63ed2f306658220b6b3707c7b6e4d2 100644
--- a/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs
+++ b/src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs
@@ -1,6 +1,6 @@
 
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/Jig/JigEx.cs b/src/CADShared/ExtensionMethod/Jig/JigEx.cs
index 84fe2497835e1a012cfa11e5c700622e4c094285..eac7b62123861beea6321a79566386a58ce94afe 100644
--- a/src/CADShared/ExtensionMethod/Jig/JigEx.cs
+++ b/src/CADShared/ExtensionMethod/Jig/JigEx.cs
@@ -1,4 +1,4 @@
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 
 // ReSharper disable ClassWithVirtualMembersNeverInherited.Global
diff --git a/src/CADShared/ExtensionMethod/RXClassEx.cs b/src/CADShared/ExtensionMethod/RXClassEx.cs
index a6e299a9a6a1624681b060ecf056df3c6c2def4e..d077e5392fe54b1250cbd62419887628c3a77b1b 100644
--- a/src/CADShared/ExtensionMethod/RXClassEx.cs
+++ b/src/CADShared/ExtensionMethod/RXClassEx.cs
@@ -1,4 +1,4 @@
-namespace IFoxCAD.CAD;
+namespace IFoxCAD.Cad;
 
 /// <summary>
 /// RXClass扩展
diff --git a/src/CADShared/ExtensionMethod/SelectionSetEx.cs b/src/CADShared/ExtensionMethod/SelectionSetEx.cs
index 58d513a7175bfaca8a4382c1055586615a61c437..26d39bcf8dc902d43caaabbfa60648256567e324 100644
--- a/src/CADShared/ExtensionMethod/SelectionSetEx.cs
+++ b/src/CADShared/ExtensionMethod/SelectionSetEx.cs
@@ -1,5 +1,4 @@
-using IFoxCAD.CAD;
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs b/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs
index 4aa3a5ab2547dd5385ed6f7080514f863dfe5e5e..1c2c1abc5e3000f2abbfc79c6cc440a241033547 100644
--- a/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs
+++ b/src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs
@@ -1,5 +1,5 @@
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/ExtensionMethod/XrefEx.cs b/src/CADShared/ExtensionMethod/XrefEx.cs
index b23d94c581ab6bc5d5a87c763f799d6b46e3ad36..5910cd3520e6a32f6e2db305114843b1750597e9 100644
--- a/src/CADShared/ExtensionMethod/XrefEx.cs
+++ b/src/CADShared/ExtensionMethod/XrefEx.cs
@@ -1,6 +1,6 @@
 // ReSharper disable ForCanBeConvertedToForeach
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/Initialize/AutoRegAssem.cs b/src/CADShared/Initialize/AutoRegAssem.cs
index eeecf3c769c2cc1c6f0c17086589bba05435b9c3..8bd70dcdc5067b77663927e5303b77b5bc7ec143 100644
--- a/src/CADShared/Initialize/AutoRegAssem.cs
+++ b/src/CADShared/Initialize/AutoRegAssem.cs
@@ -1,4 +1,4 @@
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/Initialize/MethodInfoHelper.cs b/src/CADShared/Initialize/MethodInfoHelper.cs
index 79bede79fc9af4b5e429dc9830a571a587dfbe54..b671885e697734f5d3251c62af81cdf51e2253a7 100644
--- a/src/CADShared/Initialize/MethodInfoHelper.cs
+++ b/src/CADShared/Initialize/MethodInfoHelper.cs
@@ -1,4 +1,4 @@
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/Runtime/DBTrans.cs b/src/CADShared/Runtime/DBTrans.cs
index a1a4cb44a0f84ccdfe11037b060187efc417d306..dd8766bae73f4354053337d0433b2a6493f51eba 100644
--- a/src/CADShared/Runtime/DBTrans.cs
+++ b/src/CADShared/Runtime/DBTrans.cs
@@ -1,5 +1,5 @@
 namespace IFoxCAD.Cad;
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 using System.Diagnostics;
diff --git a/src/CADShared/Runtime/Env.cs b/src/CADShared/Runtime/Env.cs
index a0f9430c976dd6cee138ef2b68108e8082d7efd2..fd18bc87b102a194ec5b9b5bb30b00a2142acf74 100644
--- a/src/CADShared/Runtime/Env.cs
+++ b/src/CADShared/Runtime/Env.cs
@@ -1,10 +1,4 @@
-#if zcad
-using Marshaler = ZwSoft.ZwCAD.Runtime.Marshaler;
-#else
-using System.Security;
-using Marshaler = Autodesk.AutoCAD.Runtime.Marshaler;
-#endif
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/CADShared/Runtime/SymbolTable.cs b/src/CADShared/Runtime/SymbolTable.cs
index ad73274b0ddd15dca062e4dafc790bae63d62eaa..c6c9422ebc5dd7275ee43a4de992704eabd39527 100644
--- a/src/CADShared/Runtime/SymbolTable.cs
+++ b/src/CADShared/Runtime/SymbolTable.cs
@@ -1,6 +1,6 @@
 // ReSharper disable RedundantNameQualifier
 
-#if a2024 || zcad
+#if !NET8_0_OR_GREATER
 using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx;
 #endif
 
diff --git a/src/IFoxCAD.AutoCad/GlobalUsings.cs b/src/IFoxCAD.AutoCad/GlobalUsings.cs
index 67dcfff663047d2efb5ed03f2fb037777e1afd30..adf89e10316a196f8b4e189daf2deb2406ff0157 100644
--- a/src/IFoxCAD.AutoCad/GlobalUsings.cs
+++ b/src/IFoxCAD.AutoCad/GlobalUsings.cs
@@ -21,6 +21,7 @@
 global using Utils = Autodesk.AutoCAD.Internal.Utils;
 global using SystemVariableChangedEventArgs = Autodesk.AutoCAD.ApplicationServices.SystemVariableChangedEventArgs;
 global using AcException = Autodesk.AutoCAD.Runtime.Exception;
+global using Marshaler = Autodesk.AutoCAD.Runtime.Marshaler;
 global using System;
 global using System.Reflection;
 global using System.Collections;
@@ -31,6 +32,7 @@
 global using System.Text;
 global using System.Runtime.InteropServices;
 global using System.ComponentModel;
+global using System.Security;
 global using Exception = System.Exception;
 global using DrawingColor = System.Drawing.Color;
 global using Registry = Microsoft.Win32.Registry;
diff --git a/src/IFoxCAD.ZwCad/GlobalUsings.cs b/src/IFoxCAD.ZwCad/GlobalUsings.cs
index a3365f56a2c6baa8b18683d5b5e54487f6ffbb4a..7b2f55ea664aed674b9ddb68d4961b29aad7e3ec 100644
--- a/src/IFoxCAD.ZwCad/GlobalUsings.cs
+++ b/src/IFoxCAD.ZwCad/GlobalUsings.cs
@@ -21,6 +21,7 @@
 global using Utils = ZwSoft.ZwCAD.Internal.Utils;
 global using SystemVariableChangedEventArgs = ZwSoft.ZwCAD.ApplicationServices.SystemVariableChangedEventArgs;
 global using AcException = ZwSoft.ZwCAD.Runtime.Exception;
+global using Marshaler = ZwSoft.ZwCAD.Runtime.Marshaler;
 global using System;
 global using System.Reflection;
 global using System.Collections;