From 6d0ffb62cfb2bbda9de030472aa6fcc03aaa2cdd Mon Sep 17 00:00:00 2001 From: vicwjb Date: Sat, 28 Jun 2025 13:01:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96namespace=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CADShared/Runtime/Env.cs | 7 +------ src/IFoxCAD.AutoCad/GlobalUsings.cs | 2 ++ src/IFoxCAD.ZwCad/GlobalUsings.cs | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/CADShared/Runtime/Env.cs b/src/CADShared/Runtime/Env.cs index a0f9430..d299067 100644 --- a/src/CADShared/Runtime/Env.cs +++ b/src/CADShared/Runtime/Env.cs @@ -1,9 +1,4 @@ -#if zcad -using Marshaler = ZwSoft.ZwCAD.Runtime.Marshaler; -#else -using System.Security; -using Marshaler = Autodesk.AutoCAD.Runtime.Marshaler; -#endif + #if a2024 || zcad using ArgumentNullException = IFoxCAD.Basal.ArgumentNullEx; #endif diff --git a/src/IFoxCAD.AutoCad/GlobalUsings.cs b/src/IFoxCAD.AutoCad/GlobalUsings.cs index 67dcfff..adf89e1 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 a3365f5..7b2f55e 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; -- Gitee From 38a4f325dc773ab316afba0e1d3afac55f37af8a Mon Sep 17 00:00:00 2001 From: vicwjb Date: Mon, 3 Feb 2025 23:32:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=AC=A6=E5=8F=B7=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E7=BC=96=E8=AF=91=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8Eifox=E7=9A=84=E6=BA=90=E7=A0=81=E4=B8=8D=E7=AC=A6?= =?UTF-8?q?=E6=97=B6=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CADShared/Algorithms/QuadTree/Rect.cs | 4 +--- src/CADShared/Basal/Nullable/ArgumentNullEx.cs | 2 +- .../Basal/Nullable/CallerArgumentExpressionAttribute.cs | 2 +- src/CADShared/Basal/Win/WindowsAPI.cs | 2 +- src/CADShared/ExtensionMethod/Entity/BlockReferenceEx.cs | 2 +- src/CADShared/ExtensionMethod/Entity/CurveEx.cs | 2 +- src/CADShared/ExtensionMethod/Geomerty/PointEx.cs | 2 +- src/CADShared/ExtensionMethod/Hatch/HatchConverter.cs | 2 +- src/CADShared/ExtensionMethod/Hatch/HatchInfo.cs | 2 +- src/CADShared/ExtensionMethod/Jig/JigEx.cs | 2 +- src/CADShared/ExtensionMethod/SelectionSetEx.cs | 3 +-- src/CADShared/ExtensionMethod/SymbolTableRecordEx.cs | 2 +- src/CADShared/ExtensionMethod/XrefEx.cs | 2 +- src/CADShared/Initialize/AutoRegAssem.cs | 2 +- src/CADShared/Initialize/MethodInfoHelper.cs | 2 +- src/CADShared/Runtime/DBTrans.cs | 2 +- src/CADShared/Runtime/Env.cs | 3 +-- src/CADShared/Runtime/SymbolTable.cs | 2 +- 18 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/CADShared/Algorithms/QuadTree/Rect.cs b/src/CADShared/Algorithms/QuadTree/Rect.cs index 1366442..d771c19 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 7fb7763..517cd14 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; /// diff --git a/src/CADShared/Basal/Nullable/CallerArgumentExpressionAttribute.cs b/src/CADShared/Basal/Nullable/CallerArgumentExpressionAttribute.cs index e6f5660..505d5ee 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; /// /// 指示参数将为另一个参数传递的表达式捕获为字符串。 diff --git a/src/CADShared/Basal/Win/WindowsAPI.cs b/src/CADShared/Basal/Win/WindowsAPI.cs index 5125d47..5b12ae2 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 fcd4041..cdeda32 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 14a5113..0df06cd 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 f920a3c..2a89e17 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 fe79a62..eb17ddd 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 f836615..b1d7576 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 84fe249..eac7b62 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/SelectionSetEx.cs b/src/CADShared/ExtensionMethod/SelectionSetEx.cs index 58d513a..26d39bc 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 4aa3a5a..1c2c1ab 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 b23d94c..5910cd3 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 eeecf3c..8bd70dc 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 79bede7..b671885 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 a1a4cb4..dd8766b 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 d299067..fd18bc8 100644 --- a/src/CADShared/Runtime/Env.cs +++ b/src/CADShared/Runtime/Env.cs @@ -1,5 +1,4 @@ - -#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 ad73274..c6c9422 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 -- Gitee From 8ea7149f4cf19d36523e2e14d31b6efbf601c076 Mon Sep 17 00:00:00 2001 From: vicwjb Date: Sat, 28 Jun 2025 13:51:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=A9=BA=E9=97=B4=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CADShared/ExtensionMethod/RXClassEx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CADShared/ExtensionMethod/RXClassEx.cs b/src/CADShared/ExtensionMethod/RXClassEx.cs index a6e299a..d077e53 100644 --- a/src/CADShared/ExtensionMethod/RXClassEx.cs +++ b/src/CADShared/ExtensionMethod/RXClassEx.cs @@ -1,4 +1,4 @@ -namespace IFoxCAD.CAD; +namespace IFoxCAD.Cad; /// /// RXClass扩展 -- Gitee