xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、合并master与2021.1

Browse Source
This commit is contained in:
xiejunjie
2021-12-03 11:25:35 +08:00
parent dc07b8879b
commit 4bd7d1b80b
981 changed files with 384342 additions and 6470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.sln
+64 -3
View File
@@ -11,9 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Win32TestDll", "Win32TestDl
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTestDll", "ConsoleTestDll\ConsoleTestDll.csproj", "{5E3B7ED1-B324-4966-8527-D29873AC3815}"
ProjectSection(ProjectDependencies) = postProject
{A945B062-6081-49F0-992D-D14769C4C7D4} = {A945B062-6081-49F0-992D-D14769C4C7D4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RobotControlDll", "RobotControlDll\RobotControlDll.vcxproj", "{97135385-2250-42E5-93B2-E3CC070B6EB9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RS232_DLL", "RS232_DLL\RS232_DLL.vcxproj", "{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -164,6 +165,66 @@ Global
{5E3B7ED1-B324-4966-8527-D29873AC3815}.Template|x64.ActiveCfg = Release|x86
{5E3B7ED1-B324-4966-8527-D29873AC3815}.Template|x86.ActiveCfg = Release|x86
{5E3B7ED1-B324-4966-8527-D29873AC3815}.Template|x86.Build.0 = Release|x86
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Debug|Win32.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Debug|Win32.Build.0 = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Debug|x64.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Debug|x86.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.DebugS07|Mixed Platforms.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.DebugS07|Mixed Platforms.Build.0 = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.DebugS07|Win32.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.DebugS07|Win32.Build.0 = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.DebugS07|x64.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.DebugS07|x86.ActiveCfg = Debug|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Release|Mixed Platforms.Build.0 = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Release|Win32.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Release|Win32.Build.0 = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Release|x64.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Release|x86.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.ReleaseSO7|Mixed Platforms.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.ReleaseSO7|Mixed Platforms.Build.0 = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.ReleaseSO7|Win32.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.ReleaseSO7|Win32.Build.0 = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.ReleaseSO7|x64.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.ReleaseSO7|x86.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Template|Mixed Platforms.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Template|Mixed Platforms.Build.0 = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Template|Win32.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Template|Win32.Build.0 = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Template|x64.ActiveCfg = Release|Win32
{97135385-2250-42E5-93B2-E3CC070B6EB9}.Template|x86.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Debug|Win32.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Debug|Win32.Build.0 = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Debug|x64.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Debug|x86.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.DebugS07|Mixed Platforms.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.DebugS07|Mixed Platforms.Build.0 = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.DebugS07|Win32.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.DebugS07|Win32.Build.0 = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.DebugS07|x64.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.DebugS07|x86.ActiveCfg = Debug|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Release|Mixed Platforms.Build.0 = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Release|Win32.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Release|Win32.Build.0 = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Release|x64.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Release|x86.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.ReleaseSO7|Mixed Platforms.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.ReleaseSO7|Mixed Platforms.Build.0 = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.ReleaseSO7|Win32.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.ReleaseSO7|Win32.Build.0 = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.ReleaseSO7|x64.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.ReleaseSO7|x86.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Template|Mixed Platforms.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Template|Mixed Platforms.Build.0 = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Template|Win32.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Template|Win32.Build.0 = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Template|x64.ActiveCfg = Release|Win32
{D9FB0729-41E7-4F5F-975B-50FFD6B05DF1}.Template|x86.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE