diff --git a/README.md b/README.md index 9f08edd..8f7f34c 100644 --- a/README.md +++ b/README.md @@ -136,30 +136,57 @@ XplorePlane/ ### 构建与输出 +本解决方案采用“入口程序、硬件与 Native 依赖项目固定 x64，纯托管类库保持 Any CPU”的平台策略，避免一刀切把所有类库强制为 x64。 + +[ReleaseFiles/](ReleaseFiles/) 是发布文件快照，不是普通编译输出目录；清理或更新运行依赖时需要同步检查该目录。 + ```bash # Debug -dotnet build XplorePlane.sln -c Debug +dotnet build XplorePlane.sln -c Debug -p:Platform=x64 # Release -dotnet build XplorePlane.sln -c Release +dotnet build XplorePlane.sln -c Release -p:Platform=x64 # 只构建主程序 -dotnet build XplorePlane/XplorePlane.csproj -c Release +dotnet build XplorePlane/XplorePlane.csproj -c Release -p:Platform=x64 ``` -当前主程序输出目录由 [XplorePlane/XplorePlane.csproj](XplorePlane/XplorePlane.csproj) 配置为： +当前解决方案面向 x64 平台，主程序输出目录由 [XplorePlane/XplorePlane.csproj](XplorePlane/XplorePlane.csproj) 配置为： ```text -D:\XplorePlane\bin\\net8.0-windows\win-x64\ +D:\XplorePlane\bin\\\net8.0-windows\win-x64\ +``` + +当前 Debug 生成目录格式： + +```text +D:\XplorePlane\bin\x64\Debug\net8.0-windows\win-x64\ +``` + +当前生成目录结构： + +```text +D:\XplorePlane\bin\ +└── x64\ + └── Debug\ + └── net8.0-windows\ + └── win-x64\ + ├── XplorePlane.exe + ├── XplorePlane.dll + ├── XplorePlane.dll.config + ├── Host\ # Comet Host 输出目录 + ├── runtimes\ # NuGet / runtime 原生依赖 + └── ... # 其他程序集、资源与运行依赖 ``` Comet Host 编译后会复制到当前主程序输出目录的 `Host/` 子目录： ```text -D:\XplorePlane\bin\\net8.0-windows\win-x64\Host\ +D:\XplorePlane\bin\x64\Debug\net8.0-windows\win-x64\Host\ ``` -[ReleaseFiles/](ReleaseFiles/) 是发布文件快照，不是普通编译输出目录；清理或更新运行依赖时需要同步检查该目录。 +### 平台配置策略 + ### TO-DO List diff --git a/ReleaseFiles/Libs/Hardware/HslCommunication.dll b/ReleaseFiles/Libs/Hardware/HslCommunication.dll deleted file mode 100644 index 3f1f8e2..0000000 Binary files a/ReleaseFiles/Libs/Hardware/HslCommunication.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Common.dll b/ReleaseFiles/Libs/Hardware/XP.Common.dll deleted file mode 100644 index f542a8b..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Common.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Common.pdb b/ReleaseFiles/Libs/Hardware/XP.Common.pdb deleted file mode 100644 index 50c04b0..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Common.pdb and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Hardware.Detector.dll b/ReleaseFiles/Libs/Hardware/XP.Hardware.Detector.dll deleted file mode 100644 index a9c88df..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Hardware.Detector.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Hardware.PLC.dll b/ReleaseFiles/Libs/Hardware/XP.Hardware.PLC.dll deleted file mode 100644 index dbef651..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Hardware.PLC.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.Comet.Messages.dll b/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.Comet.Messages.dll deleted file mode 100644 index 6adcfb0..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.Comet.Messages.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.dll b/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.dll deleted file mode 100644 index 316e58f..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.pdb b/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.pdb deleted file mode 100644 index 78c588d..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource.pdb and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource_Framework.dll b/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource_Framework.dll deleted file mode 100644 index eb1c1c6..0000000 Binary files a/ReleaseFiles/Libs/Hardware/XP.Hardware.RaySource_Framework.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/en-US/XP.Common.resources.dll b/ReleaseFiles/Libs/Hardware/en-US/XP.Common.resources.dll deleted file mode 100644 index 355f436..0000000 Binary files a/ReleaseFiles/Libs/Hardware/en-US/XP.Common.resources.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/zh-CN/XP.Common.resources.dll b/ReleaseFiles/Libs/Hardware/zh-CN/XP.Common.resources.dll deleted file mode 100644 index 0c51f31..0000000 Binary files a/ReleaseFiles/Libs/Hardware/zh-CN/XP.Common.resources.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Hardware/zh-TW/XP.Common.resources.dll b/ReleaseFiles/Libs/Hardware/zh-TW/XP.Common.resources.dll deleted file mode 100644 index 0f5892d..0000000 Binary files a/ReleaseFiles/Libs/Hardware/zh-TW/XP.Common.resources.dll and /dev/null differ diff --git a/ReleaseFiles/Libs/Native/BR.AN.PviServices.dll b/ReleaseFiles/Libs/Native/BR.AN.PviServices.dll deleted file mode 100644 index 6a6a038..0000000 Binary files a/ReleaseFiles/Libs/Native/BR.AN.PviServices.dll and /dev/null differ diff --git a/XP.Camera/XP.Camera.csproj b/XP.Camera/XP.Camera.csproj index c4cbd94..456a200 100644 --- a/XP.Camera/XP.Camera.csproj +++ b/XP.Camera/XP.Camera.csproj @@ -3,6 +3,8 @@ net8.0-windows true + x64 + x64 enable enable XP.Camera diff --git a/XP.Hardware.Detector/XP.Hardware.Detector.csproj b/XP.Hardware.Detector/XP.Hardware.Detector.csproj index 02e4e87..017dd83 100644 --- a/XP.Hardware.Detector/XP.Hardware.Detector.csproj +++ b/XP.Hardware.Detector/XP.Hardware.Detector.csproj @@ -1,7 +1,9 @@ - + net8.0-windows7.0 true + x64 + x64 true diff --git a/XP.Hardware.MotionControl/XP.Hardware.MotionControl.csproj b/XP.Hardware.MotionControl/XP.Hardware.MotionControl.csproj index 05e7477..cca809b 100644 --- a/XP.Hardware.MotionControl/XP.Hardware.MotionControl.csproj +++ b/XP.Hardware.MotionControl/XP.Hardware.MotionControl.csproj @@ -1,7 +1,9 @@ - + net8.0-windows7.0 true + x64 + x64 diff --git a/XP.Hardware.PLC.Sentry/XP.Hardware.PLC.Sentry.csproj b/XP.Hardware.PLC.Sentry/XP.Hardware.PLC.Sentry.csproj index a348f0b..d708984 100644 --- a/XP.Hardware.PLC.Sentry/XP.Hardware.PLC.Sentry.csproj +++ b/XP.Hardware.PLC.Sentry/XP.Hardware.PLC.Sentry.csproj @@ -1,7 +1,9 @@ - + net8.0-windows7.0 true + x64 + x64 WinExe XplorerPlane.ico diff --git a/XP.Hardware.PLC/XP.Hardware.PLC.csproj b/XP.Hardware.PLC/XP.Hardware.PLC.csproj index 96831d0..c8a6160 100644 --- a/XP.Hardware.PLC/XP.Hardware.PLC.csproj +++ b/XP.Hardware.PLC/XP.Hardware.PLC.csproj @@ -1,7 +1,9 @@ - + net8.0-windows7.0 true + x64 + x64 diff --git a/XP.Hardware.RaySource.Comet.Host/XP.Hardware.RaySource.Comet.Host.csproj b/XP.Hardware.RaySource.Comet.Host/XP.Hardware.RaySource.Comet.Host.csproj index bd60ace..b14ec13 100644 --- a/XP.Hardware.RaySource.Comet.Host/XP.Hardware.RaySource.Comet.Host.csproj +++ b/XP.Hardware.RaySource.Comet.Host/XP.Hardware.RaySource.Comet.Host.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01} WinExe Properties @@ -14,22 +14,24 @@ true true - + true full false - bin\Debug\ + bin\x64\Debug\ DEBUG;TRACE prompt 4 + x64 - + pdbonly true - bin\Release\ + bin\x64\Release\ TRACE prompt 4 + x64 Comet.Host.Icon.ico @@ -104,7 +106,7 @@ - if not exist "$(SolutionDir)bin\$(ConfigurationName)\net8.0-windows\win-x64\Host\" mkdir "$(SolutionDir)bin\$(ConfigurationName)\net8.0-windows\win-x64\Host\" -xcopy /Y /D "$(TargetDir)*.*" "$(SolutionDir)bin\$(ConfigurationName)\net8.0-windows\win-x64\Host\" + if not exist "$(SolutionDir)bin\$(Platform)\$(ConfigurationName)\net8.0-windows\win-x64\Host\" mkdir "$(SolutionDir)bin\$(Platform)\$(ConfigurationName)\net8.0-windows\win-x64\Host\" +xcopy /Y /D "$(TargetDir)*.*" "$(SolutionDir)bin\$(Platform)\$(ConfigurationName)\net8.0-windows\win-x64\Host\" \ No newline at end of file diff --git a/XP.Hardware.RaySource/XP.Hardware.RaySource.csproj b/XP.Hardware.RaySource/XP.Hardware.RaySource.csproj index c9c4b13..3970ffe 100644 --- a/XP.Hardware.RaySource/XP.Hardware.RaySource.csproj +++ b/XP.Hardware.RaySource/XP.Hardware.RaySource.csproj @@ -1,7 +1,9 @@ - + net8.0-windows7.0 true + x64 + x64 diff --git a/XP.ImageProcessing.Processors/XP.ImageProcessing.Processors.csproj b/XP.ImageProcessing.Processors/XP.ImageProcessing.Processors.csproj index caaf7d6..850839d 100644 --- a/XP.ImageProcessing.Processors/XP.ImageProcessing.Processors.csproj +++ b/XP.ImageProcessing.Processors/XP.ImageProcessing.Processors.csproj @@ -2,6 +2,8 @@ net8.0-windows + x64 + x64 enable enable true diff --git a/XplorePlane.sln b/XplorePlane.sln index c45ba30..c43fc8d 100644 --- a/XplorePlane.sln +++ b/XplorePlane.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.14.37203.1 @@ -77,18 +77,19 @@ Global {07978DB9-4B88-4F42-9054-73992742BD6A}.Debug|x64.ActiveCfg = Debug|x64 {07978DB9-4B88-4F42-9054-73992742BD6A}.Debug|x64.Build.0 = Debug|x64 {07978DB9-4B88-4F42-9054-73992742BD6A}.Release|x64.ActiveCfg = Release|x64 - {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|x64.ActiveCfg = Debug|Any CPU - {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|x64.Build.0 = Debug|Any CPU - {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Release|x64.ActiveCfg = Release|Any CPU - {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Release|x64.Build.0 = Release|Any CPU + {07978DB9-4B88-4F42-9054-73992742BD6A}.Release|x64.Build.0 = Release|x64 + {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|x64.ActiveCfg = Debug|x64 + {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Debug|x64.Build.0 = Debug|x64 + {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Release|x64.ActiveCfg = Release|x64 + {82762CDE-48CC-4E28-ABEC-1FC752BACEF4}.Release|x64.Build.0 = Release|x64 {01EDC1D8-F6BC-2677-AE59-89BA3FC2C74F}.Debug|x64.ActiveCfg = Debug|Any CPU {01EDC1D8-F6BC-2677-AE59-89BA3FC2C74F}.Debug|x64.Build.0 = Debug|Any CPU {01EDC1D8-F6BC-2677-AE59-89BA3FC2C74F}.Release|x64.ActiveCfg = Release|Any CPU {01EDC1D8-F6BC-2677-AE59-89BA3FC2C74F}.Release|x64.Build.0 = Release|Any CPU - {2687E12E-3053-E1C6-5268-E4FF547EC212}.Debug|x64.ActiveCfg = Debug|Any CPU - {2687E12E-3053-E1C6-5268-E4FF547EC212}.Debug|x64.Build.0 = Debug|Any CPU - {2687E12E-3053-E1C6-5268-E4FF547EC212}.Release|x64.ActiveCfg = Release|Any CPU - {2687E12E-3053-E1C6-5268-E4FF547EC212}.Release|x64.Build.0 = Release|Any CPU + {2687E12E-3053-E1C6-5268-E4FF547EC212}.Debug|x64.ActiveCfg = Debug|x64 + {2687E12E-3053-E1C6-5268-E4FF547EC212}.Debug|x64.Build.0 = Debug|x64 + {2687E12E-3053-E1C6-5268-E4FF547EC212}.Release|x64.ActiveCfg = Release|x64 + {2687E12E-3053-E1C6-5268-E4FF547EC212}.Release|x64.Build.0 = Release|x64 {9460CF45-8A25-9770-03AF-4602A2FFF016}.Debug|x64.ActiveCfg = Debug|Any CPU {9460CF45-8A25-9770-03AF-4602A2FFF016}.Debug|x64.Build.0 = Debug|Any CPU {9460CF45-8A25-9770-03AF-4602A2FFF016}.Release|x64.ActiveCfg = Release|Any CPU @@ -101,30 +102,30 @@ Global {866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|x64.Build.0 = Debug|Any CPU {866A7353-C822-114E-48DE-26E8A3E17F9E}.Release|x64.ActiveCfg = Release|Any CPU {866A7353-C822-114E-48DE-26E8A3E17F9E}.Release|x64.Build.0 = Release|Any CPU - {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|x64.ActiveCfg = Debug|Any CPU - {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|x64.Build.0 = Debug|Any CPU - {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|x64.ActiveCfg = Release|Any CPU - {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|x64.Build.0 = Release|Any CPU - {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|x64.ActiveCfg = Debug|Any CPU - {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|x64.Build.0 = Debug|Any CPU - {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|x64.ActiveCfg = Release|Any CPU - {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|x64.Build.0 = Release|Any CPU - {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|x64.ActiveCfg = Debug|Any CPU - {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|x64.Build.0 = Debug|Any CPU - {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|x64.ActiveCfg = Release|Any CPU - {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|x64.Build.0 = Release|Any CPU - {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|x64.ActiveCfg = Debug|Any CPU - {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|x64.Build.0 = Debug|Any CPU - {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|x64.ActiveCfg = Release|Any CPU - {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|x64.Build.0 = Release|Any CPU - {67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|x64.ActiveCfg = Debug|Any CPU - {67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|x64.Build.0 = Debug|Any CPU - {67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|x64.ActiveCfg = Release|Any CPU - {67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|x64.Build.0 = Release|Any CPU - {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|x64.ActiveCfg = Debug|Any CPU - {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|x64.Build.0 = Debug|Any CPU - {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|x64.ActiveCfg = Release|Any CPU - {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|x64.Build.0 = Release|Any CPU + {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|x64.ActiveCfg = Debug|x64 + {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|x64.Build.0 = Debug|x64 + {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|x64.ActiveCfg = Release|x64 + {760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|x64.Build.0 = Release|x64 + {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|x64.ActiveCfg = Debug|x64 + {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|x64.Build.0 = Debug|x64 + {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|x64.ActiveCfg = Release|x64 + {9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|x64.Build.0 = Release|x64 + {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|x64.ActiveCfg = Debug|x64 + {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|x64.Build.0 = Debug|x64 + {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|x64.ActiveCfg = Release|x64 + {9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|x64.Build.0 = Release|x64 + {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|x64.ActiveCfg = Debug|x64 + {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|x64.Build.0 = Debug|x64 + {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|x64.ActiveCfg = Release|x64 + {C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|x64.Build.0 = Release|x64 + {67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|x64.ActiveCfg = Debug|x64 + {67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|x64.Build.0 = Debug|x64 + {67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|x64.ActiveCfg = Release|x64 + {67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|x64.Build.0 = Release|x64 + {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|x64.ActiveCfg = Debug|x64 + {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|x64.Build.0 = Debug|x64 + {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|x64.ActiveCfg = Release|x64 + {B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|x64.Build.0 = Release|x64 {6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Debug|x64.ActiveCfg = Debug|Any CPU {6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Debug|x64.Build.0 = Debug|Any CPU {6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|x64.ActiveCfg = Release|Any CPU diff --git a/XplorePlane/XplorePlane.csproj b/XplorePlane/XplorePlane.csproj index 95d13e1..889316a 100644 --- a/XplorePlane/XplorePlane.csproj +++ b/XplorePlane/XplorePlane.csproj @@ -7,18 +7,18 @@ XplorePlane XplorePlane XplorerPlane.ico - x64;AnyCPU + x64 - + - + @@ -27,12 +27,12 @@ - + - + @@ -45,14 +45,14 @@ - + - + - Libs\Native\BR.AN.PviServices.dll + ..\ExternalLibraries\BR.AN.PviServices.dll True @@ -61,14 +61,14 @@ ..\ExternalLibraries\MvCameraControl.Net.dll true - + - + ..\ExternalLibraries\Telerik ..\bin\ - AnyCPU + x64 @@ -120,40 +120,13 @@ $(TelerikDir)\Telerik.Windows.Zip.dll - + - - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - Libs\Hardware\zh-CN\%(Filename)%(Extension) - - - PreserveNewest - Libs\Hardware\en-US\%(Filename)%(Extension) - - - PreserveNewest - Libs\Hardware\zh-TW\%(Filename)%(Extension) - @@ -166,9 +139,9 @@ PreserveNewest - + - + PreserveNewest @@ -189,5 +162,10 @@ + + + + +