diff --git a/AdbTools.sln b/AdbTools.sln index 41714ca..fe5b578 100644 --- a/AdbTools.sln +++ b/AdbTools.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.34407.143 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdbTools", "AdbTools\AdbTools.csproj", "{D80557CC-6756-4A53-BE06-2A0B21224607}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "AdbToolsSetup", "AdbToolsSetup\AdbToolsSetup.vdproj", "{22559873-B825-4CCF-816B-F0C0BC1FBA06}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,14 @@ Global {D80557CC-6756-4A53-BE06-2A0B21224607}.Release|Any CPU.Build.0 = Release|Any CPU {D80557CC-6756-4A53-BE06-2A0B21224607}.Release|x64.ActiveCfg = Release|x64 {D80557CC-6756-4A53-BE06-2A0B21224607}.Release|x64.Build.0 = Release|x64 + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Debug|Any CPU.ActiveCfg = Debug + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Debug|Any CPU.Build.0 = Debug + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Debug|x64.ActiveCfg = Debug + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Debug|x64.Build.0 = Debug + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Release|Any CPU.ActiveCfg = Release + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Release|Any CPU.Build.0 = Release + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Release|x64.ActiveCfg = Release + {22559873-B825-4CCF-816B-F0C0BC1FBA06}.Release|x64.Build.0 = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AdbToolsSetup/AdbToolsSetup.vdproj b/AdbToolsSetup/AdbToolsSetup.vdproj index b1bd074..e3b6e96 100644 --- a/AdbToolsSetup/AdbToolsSetup.vdproj +++ b/AdbToolsSetup/AdbToolsSetup.vdproj @@ -14,12 +14,6 @@ "BackwardsCompatibleGUIDGeneration" = "8:TRUE" "Hierarchy" { - "Entry" - { - "MsmKey" = "8:_0FD918CDFA2449A7A19912DFC7CD3CF5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } "Entry" { "MsmKey" = "8:_27FAF4DF0E2F43CCAC4FDAD915FD1462" @@ -28,13 +22,13 @@ } "Entry" { - "MsmKey" = "8:_489748BF5F2E4BB39DA47CF9C1544059" + "MsmKey" = "8:_63F232D224C5455BBFA4D72E0DC75A79" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8934D1769005422D9A5E125D56EF7359" + "MsmKey" = "8:_7DEF32D158994573AD225A7B47907131" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -46,6 +40,12 @@ } "Entry" { + "MsmKey" = "8:_AF7B6A6C69F843EF8F7F130222ACABDB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_EDBFE2D3C2C642E091D65D955C5D94C6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -147,29 +147,9 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0FD918CDFA2449A7A19912DFC7CD3CF5" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_63F232D224C5455BBFA4D72E0DC75A79" { - "SourcePath" = "8:..\\AdbTools\\AdbWinUsbApi.dll" - "TargetName" = "8:AdbWinUsbApi.dll" - "Tag" = "8:" - "Folder" = "8:_48590810D4264E01AF4208218750FE9E" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_489748BF5F2E4BB39DA47CF9C1544059" - { - "SourcePath" = "8:..\\AdbTools\\adb.exe" + "SourcePath" = "8:..\\libs\\adb.exe" "TargetName" = "8:adb.exe" "Tag" = "8:" "Folder" = "8:_48590810D4264E01AF4208218750FE9E" @@ -187,10 +167,10 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8934D1769005422D9A5E125D56EF7359" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7DEF32D158994573AD225A7B47907131" { - "SourcePath" = "8:..\\AdbTools\\AdbWinApi.dll" - "TargetName" = "8:AdbWinApi.dll" + "SourcePath" = "8:..\\libs\\AdbWinUsbApi.dll" + "TargetName" = "8:AdbWinUsbApi.dll" "Tag" = "8:" "Folder" = "8:_48590810D4264E01AF4208218750FE9E" "Condition" = "8:" @@ -227,6 +207,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF7B6A6C69F843EF8F7F130222ACABDB" + { + "SourcePath" = "8:..\\libs\\AdbWinApi.dll" + "TargetName" = "8:AdbWinApi.dll" + "Tag" = "8:" + "Folder" = "8:_48590810D4264E01AF4208218750FE9E" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EDBFE2D3C2C642E091D65D955C5D94C6" { "SourcePath" = "8:..\\README.md" @@ -304,7 +304,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:AdbTools" "ProductCode" = "8:{26F387CA-DA68-4DD5-A08C-465A4AEF955B}" - "PackageCode" = "8:{09F1A18A-D65F-436A-9ECA-49A7C2231ECE}" + "PackageCode" = "8:{30D079CD-9E7D-479C-BFEE-425F8B499639}" "UpgradeCode" = "8:{ED551E94-3D01-4508-A2DB-614056113FD9}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" @@ -315,7 +315,7 @@ "Manufacturer" = "8:hc" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:Adb无线连接工具安装程序" + "Title" = "8:AdbTools" "Subject" = "8:" "ARPCONTACT" = "8:hc" "Keywords" = "8:" @@ -426,7 +426,7 @@ { "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_53D006320E364BAA84F5237B5F61EA42" { - "Name" = "8:Adb无线连接工具" + "Name" = "8:AdbTools" "Arguments" = "8:" "Description" = "8:" "ShowCmd" = "3:1" diff --git a/libs/AdbWinApi.dll b/libs/AdbWinApi.dll new file mode 100644 index 0000000..c8614a9 Binary files /dev/null and b/libs/AdbWinApi.dll differ diff --git a/libs/AdbWinUsbApi.dll b/libs/AdbWinUsbApi.dll new file mode 100644 index 0000000..1e5a8d4 Binary files /dev/null and b/libs/AdbWinUsbApi.dll differ diff --git a/libs/adb.exe b/libs/adb.exe new file mode 100644 index 0000000..2cc6890 Binary files /dev/null and b/libs/adb.exe differ diff --git a/libs/icon.ico b/libs/icon.ico new file mode 100644 index 0000000..fb4b0ed Binary files /dev/null and b/libs/icon.ico differ