diff --git a/IFoxCAD.sln b/IFoxCAD.sln index 8dc6df1fa4d4fcc33c5d19b63f215141e133c464..0cfb30aeef942f9a090b976d18f6bc1562188d00 100644 --- a/IFoxCAD.sln +++ b/IFoxCAD.sln @@ -27,6 +27,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{C0BEFC15-6 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IFoxCAD.LoadEx", "src\IFoxCAD.LoadForm\IFoxCAD.LoadEx.csproj", "{BFA1C130-8D87-45D0-8E79-301C1841A7A1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IFoxCAD.Gcad", "src\IFoxCAD.Cad\IFoxCAD.Gcad\IFoxCAD.Gcad.csproj", "{A5128914-23D9-409A-B40E-D436973E89D4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IFoxCAD.Zcad", "src\IFoxCAD.Cad\IFoxCAD.Zcad\IFoxCAD.Zcad.csproj", "{3746383C-76A9-4E14-8FBD-038E51C9DC97}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -65,6 +69,14 @@ Global {BFA1C130-8D87-45D0-8E79-301C1841A7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFA1C130-8D87-45D0-8E79-301C1841A7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {BFA1C130-8D87-45D0-8E79-301C1841A7A1}.Release|Any CPU.Build.0 = Release|Any CPU + {A5128914-23D9-409A-B40E-D436973E89D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5128914-23D9-409A-B40E-D436973E89D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5128914-23D9-409A-B40E-D436973E89D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5128914-23D9-409A-B40E-D436973E89D4}.Release|Any CPU.Build.0 = Release|Any CPU + {3746383C-76A9-4E14-8FBD-038E51C9DC97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3746383C-76A9-4E14-8FBD-038E51C9DC97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3746383C-76A9-4E14-8FBD-038E51C9DC97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3746383C-76A9-4E14-8FBD-038E51C9DC97}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -77,15 +89,19 @@ Global {CED63D2D-0AF6-4831-806D-5E8E9B0D0A07} = {C0BEFC15-6DF7-4636-BC76-4A0B88231470} {8C573180-523D-427D-8030-CAA7D6B5EB6B} = {C0BEFC15-6DF7-4636-BC76-4A0B88231470} {5F478F68-19BC-4A3A-AF39-8728F8D396DD} = {C0BEFC15-6DF7-4636-BC76-4A0B88231470} + {A5128914-23D9-409A-B40E-D436973E89D4} = {465C4E39-FBA2-417A-AB31-BDC01601F420} + {3746383C-76A9-4E14-8FBD-038E51C9DC97} = {465C4E39-FBA2-417A-AB31-BDC01601F420} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {31D6C754-CF6B-4AB0-9861-6923DD312350} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution src\IFoxCAD.Cad.Shared\IFoxCAD.Cad.Shared.projitems*{36f87d06-88b3-45e3-a2a8-0fc737b25428}*SharedItemsImports = 5 + src\IFoxCAD.Cad.Shared\IFoxCAD.Cad.Shared.projitems*{3746383c-76a9-4e14-8fbd-038e51c9dc97}*SharedItemsImports = 5 tests\TestShared\TestShared.projitems*{5f478f68-19bc-4a3a-af39-8728f8d396dd}*SharedItemsImports = 5 src\IFoxCAD.Cad.Shared\IFoxCAD.Cad.Shared.projitems*{82fb8450-b971-4e30-859f-4b2ddb81f590}*SharedItemsImports = 13 tests\TestShared\TestShared.projitems*{8c573180-523d-427d-8030-caa7d6b5eb6b}*SharedItemsImports = 5 + src\IFoxCAD.Cad.Shared\IFoxCAD.Cad.Shared.projitems*{a5128914-23d9-409a-b40e-d436973e89d4}*SharedItemsImports = 5 src\IFoxCAD.Cad.Shared\IFoxCAD.Cad.Shared.projitems*{cc46e4e2-90df-48f5-b3d7-83fafed58f2a}*SharedItemsImports = 5 tests\TestShared\TestShared.projitems*{ced63d2d-0af6-4831-806d-5e8e9b0d0a07}*SharedItemsImports = 13 EndGlobalSection diff --git a/src/IFoxCAD.Cad/IFoxCAD.Aacad08/IFoxCAD.Acad08.csproj b/src/IFoxCAD.Cad/IFoxCAD.Aacad08/IFoxCAD.Acad08.csproj index 6603b766892e0bd2abe170f679ec9b481e16b636..d0e62e656b840c1b3b16c0d583ec2fec53e17230 100644 --- a/src/IFoxCAD.Cad/IFoxCAD.Aacad08/IFoxCAD.Acad08.csproj +++ b/src/IFoxCAD.Cad/IFoxCAD.Aacad08/IFoxCAD.Acad08.csproj @@ -33,6 +33,7 @@ DEBUG + $(Configuration);ac2008;ac2009 diff --git a/src/IFoxCAD.Cad/IFoxCAD.Gcad/GlobalUsings.cs b/src/IFoxCAD.Cad/IFoxCAD.Gcad/GlobalUsings.cs new file mode 100644 index 0000000000000000000000000000000000000000..3f82278af1eba7d5c43fdf178121a1161e6e55f9 --- /dev/null +++ b/src/IFoxCAD.Cad/IFoxCAD.Gcad/GlobalUsings.cs @@ -0,0 +1,40 @@ +/// 系统引用 +global using System; +global using System.Collections; +global using System.Collections.Generic; +global using System.IO; +global using System.Linq; +global using System.Text; +global using System.Reflection; +global using System.Text.RegularExpressions; +global using Microsoft.Win32; +global using System.ComponentModel; +global using System.Runtime.InteropServices; + +global using Exception = System.Exception; + +/// autocad 引用 +global using GrxCAD.ApplicationServices; +global using GrxCAD.EditorInput; +global using GrxCAD.Colors; +global using GrxCAD.DatabaseServices; +global using GrxCAD.Geometry; +global using GrxCAD.Runtime; +global using Acap = GrxCAD.ApplicationServices.Application; + +global using GrxCAD.DatabaseServices.Filters; +global using GrxCAD; + +//jig命名空间会引起Viewport/Polyline等等重义,最好逐个引入 using Autodesk.AutoCAD.GraphicsInterface +global using WorldDraw = GrxCAD.GraphicsInterface.WorldDraw; +global using Manager = GrxCAD.GraphicsSystem.Manager; + +global using Group = GrxCAD.DatabaseServices.Group; +global using Viewport = GrxCAD.DatabaseServices.Viewport; + +global using System.Collections.Specialized; +global using Registry = Microsoft.Win32.Registry; +global using RegistryKey = Microsoft.Win32.RegistryKey; + +/// ifoxcad.basal 引用 +global using IFoxCAD.Basal; \ No newline at end of file diff --git a/src/IFoxCAD.Cad/IFoxCAD.Gcad/IFoxCAD.Gcad.csproj b/src/IFoxCAD.Cad/IFoxCAD.Gcad/IFoxCAD.Gcad.csproj index 7852e32152235a0fa9c7391ecae6a9ce469b775d..d1a8911474fb979a2026f77faeb1a6bbdb417b29 100644 --- a/src/IFoxCAD.Cad/IFoxCAD.Gcad/IFoxCAD.Gcad.csproj +++ b/src/IFoxCAD.Cad/IFoxCAD.Gcad/IFoxCAD.Gcad.csproj @@ -1,7 +1,7 @@  - net35;net40;net45 + NET48 true enable true @@ -22,48 +22,24 @@ true LICENSE true - x64 + - - - runtime - - - - - - runtime - - - - - - runtime - - - 4.3.0 - - + + DEBUG + + + $(Configuration);GCAD + - + + + runtime + + - - DEBUG - - - $(Configuration);ac2009 - - - $(Configuration);ac2013 - - - $(Configuration);ac2015 - - + True diff --git a/src/IFoxCAD.Cad/IFoxCAD.Zcad/GlobalUsings.cs b/src/IFoxCAD.Cad/IFoxCAD.Zcad/GlobalUsings.cs new file mode 100644 index 0000000000000000000000000000000000000000..36eeee5a10d2141a7835589f5abe743bf5330478 --- /dev/null +++ b/src/IFoxCAD.Cad/IFoxCAD.Zcad/GlobalUsings.cs @@ -0,0 +1,40 @@ +/// 系统引用 +global using System; +global using System.Collections; +global using System.Collections.Generic; +global using System.IO; +global using System.Linq; +global using System.Text; +global using System.Reflection; +global using System.Text.RegularExpressions; +global using Microsoft.Win32; +global using System.ComponentModel; +global using System.Runtime.InteropServices; + +global using Exception = System.Exception; + +/// autocad 引用 +global using ZwSoft.ZwCAD.ApplicationServices; +global using ZwSoft.ZwCAD.EditorInput; +global using ZwSoft.ZwCAD.Colors; +global using ZwSoft.ZwCAD.DatabaseServices; +global using ZwSoft.ZwCAD.Geometry; +global using ZwSoft.ZwCAD.Runtime; +global using Acap = ZwSoft.ZwCAD.ApplicationServices.Application; + +global using ZwSoft.ZwCAD.DatabaseServices.Filters; +global using ZwSoft.ZwCAD; + +//jig命名空间会引起Viewport/Polyline等等重义,最好逐个引入 using ZwSoft.ZwCAD.GraphicsInterface +global using WorldDraw = ZwSoft.ZwCAD.GraphicsInterface.WorldDraw; +global using Manager = ZwSoft.ZwCAD.GraphicsSystem.Manager; + +global using Group = ZwSoft.ZwCAD.DatabaseServices.Group; +global using Viewport = ZwSoft.ZwCAD.DatabaseServices.Viewport; + +global using System.Collections.Specialized; +global using Registry = Microsoft.Win32.Registry; +global using RegistryKey = Microsoft.Win32.RegistryKey; + +/// ifoxcad.basal 引用 +global using IFoxCAD.Basal; \ No newline at end of file diff --git a/src/IFoxCAD.Cad/IFoxCAD.Zcad/IFoxCAD.Zcad.csproj b/src/IFoxCAD.Cad/IFoxCAD.Zcad/IFoxCAD.Zcad.csproj index 7852e32152235a0fa9c7391ecae6a9ce469b775d..6b6305e1a1ce8eb713a16e9bffad52f6185858b7 100644 --- a/src/IFoxCAD.Cad/IFoxCAD.Zcad/IFoxCAD.Zcad.csproj +++ b/src/IFoxCAD.Cad/IFoxCAD.Zcad/IFoxCAD.Zcad.csproj @@ -1,7 +1,7 @@  - net35;net40;net45 + NET45;NET48 true enable true @@ -22,47 +22,33 @@ true LICENSE true - x64 + - - - runtime - - - - - - runtime - - - - - - runtime - - - 4.3.0 - - - - - - DEBUG - - $(Configuration);ac2009 - - - $(Configuration);ac2013 - + - $(Configuration);ac2015 + $(Configuration);ZCAD + + + $(Configuration);ZCAD + + + + + runtime + + + + + + runtime + + + True