将Feature/XP.Common和Feature/XP.Hardware分支合并至Develop/XP.forHardwareAndCommon，完善XPapp注册和相关硬件类库通用类库功能。
This commit is contained in:
QI Mingxuan
+112
@@ -40,6 +40,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExternalLibraries", "Extern
|
||||
ExternalLibraries\version_string.inc = ExternalLibraries\version_string.inc
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Common", "XP.Common\XP.Common.csproj", "{866A7353-C822-114E-48DE-26E8A3E17F9E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.Detector", "XP.Hardware.Detector\XP.Hardware.Detector.csproj", "{760D5EAC-795A-6666-1BE0-E30B1B2822C3}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.MotionControl", "XP.Hardware.MotionControl\XP.Hardware.MotionControl.csproj", "{9391C622-4552-8081-A1E8-B3447E0E7A4F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.PLC", "XP.Hardware.PLC\XP.Hardware.PLC.csproj", "{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.PLC.Sentry", "XP.Hardware.PLC.Sentry\XP.Hardware.PLC.Sentry.csproj", "{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.RaySource", "XP.Hardware.RaySource\XP.Hardware.RaySource.csproj", "{67D180E8-AB8F-FF62-ED46-270803B8F713}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.RaySource.Comet.Host", "XP.Hardware.RaySource.Comet.Host\XP.Hardware.RaySource.Comet.Host.csproj", "{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XP.Hardware.RaySource.Comet.Messages", "XP.Hardware.RaySource.Comet.Messages\XP.Hardware.RaySource.Comet.Messages.csproj", "{6170AF9F-A792-6BDC-4E25-072EA87FAA15}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -134,6 +150,102 @@ Global
|
||||
{57061533-EC58-1B1C-3862-9164BC73C806}.Release|x64.Build.0 = Release|Any CPU
|
||||
{57061533-EC58-1B1C-3862-9164BC73C806}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{57061533-EC58-1B1C-3862-9164BC73C806}.Release|x86.Build.0 = Release|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Release|Any CPU.Build.0 = Release|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
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{866A7353-C822-114E-48DE-26E8A3E17F9E}.Release|x86.Build.0 = Release|Any CPU
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|Any CPU.Build.0 = Debug|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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|Any CPU.Build.0 = Release|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
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{760D5EAC-795A-6666-1BE0-E30B1B2822C3}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|Any CPU.Build.0 = Debug|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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|Any CPU.Build.0 = Release|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
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9391C622-4552-8081-A1E8-B3447E0E7A4F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|Any CPU.Build.0 = Debug|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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|Any CPU.Build.0 = Release|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
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9E9FB4E7-22F9-D475-D9DA-0D647BF6DFD9}.Release|x86.Build.0 = Release|Any CPU
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|Any CPU.Build.0 = Debug|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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|Any CPU.Build.0 = Release|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
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{C0635DDF-1BCC-2F86-3BA1-12E0469F114B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|Any CPU.Build.0 = Debug|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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|Any CPU.Build.0 = Release|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
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{67D180E8-AB8F-FF62-ED46-270803B8F713}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|Any CPU.Build.0 = Debug|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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|Any CPU.Build.0 = Release|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
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B8F5E3A1-7C2D-4E9F-A1B3-6D8E4F2C9A01}.Release|x86.Build.0 = Release|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{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}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|x64.Build.0 = Release|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{6170AF9F-A792-6BDC-4E25-072EA87FAA15}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
Reference in New Issue
Block a user