diff --git a/.gitignore b/.gitignore index 8b855c4f9..e16267ec3 100755 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /ZeroTier One.zip /ZeroTier One.dmg /windows/x64 +/windows/ZeroTierOneInstaller/ZeroTierOneInstaller diff --git a/windows/ZeroTierOne.sln b/windows/ZeroTierOne.sln index 0f2e52d77..3c7b4d798 100644 --- a/windows/ZeroTierOne.sln +++ b/windows/ZeroTierOne.sln @@ -13,6 +13,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroTierOne", "ZeroTierOne\ZeroTierOne.vcxproj", "{B00A4957-5977-4AC1-9EF4-571DC27EADA2}" EndProject Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "ZeroTierOneInstaller", "ZeroTierOneInstaller\ZeroTierOneInstaller.isproj", "{C4424647-0581-47D1-918B-575BFF735CAA}" + ProjectSection(ProjectDependencies) = postProject + {63D28112-9A56-42FA-9C3E-EF6C58AF09B3} = {63D28112-9A56-42FA-9C3E-EF6C58AF09B3} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroTierOneService", "ZeroTierOneService\ZeroTierOneService.csproj", "{63D28112-9A56-42FA-9C3E-EF6C58AF09B3}" EndProject @@ -78,7 +81,8 @@ Global {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Win32.ActiveCfg = Release|Win32 {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|Win32.Build.0 = Release|Win32 - {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x64.ActiveCfg = Debug|Win32 + {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x64.ActiveCfg = Debug|x64 + {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.Debug|x64.Build.0 = Debug|x64 {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Any CPU.ActiveCfg = Debug|Win32 {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Win32 {DCD73B97-0F44-4044-8BA4-95B59CCAB4BD}.DVD-5|Mixed Platforms.Build.0 = Debug|Win32 diff --git a/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isl b/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isl index 9b94b2aea..f0b2a4e70 100644 --- a/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isl +++ b/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isl @@ -352,6 +352,8 @@ Qt5Widgets.dll{205A3CCB-CF34-4208-8944-7861AA7A71E3}INSTALLDIR2qt5widgets.dll17/LogFile=/LogFile=/LogFile=/LogFile= WdfCoinstaller01011.dll{181ACA78-4FCE-48F4-A2A3-3B9ADA1C9849}X642wdfcoinstaller01011.dll17/LogFile=/LogFile=/LogFile=/LogFile= WdfCoinstaller01011.dll1{2C7D1A20-31A6-4F69-AA02-AFD6F51AC22B}X862wdfcoinstaller01011.dll117/LogFile=/LogFile=/LogFile=/LogFile= + ZeroTierOneService.Primary_output{A3481E7F-595F-41F7-AC07-89A0DC764646}INSTALLDIR2zerotieroneservice.primary_o17/LogFile=/LogFile=/LogFile=/LogFile= + ZeroTier_One.exe{19114EA7-C188-4171-9B49-9D78674D7547}INSTALLDIR2zerotier_one.exe17/LogFile=/LogFile=/LogFile=/LogFile= devcon_x64.exe{4C7D90E3-6542-4BB3-A94A-96EC3AB0B936}ONE2devcon_x64.exe17/LogFile=/LogFile=/LogFile=/LogFile= devcon_x86.exe{3235C2E7-DCC2-47AE-925F-71A023406734}ONE2devcon_x86.exe17/LogFile=/LogFile=/LogFile=/LogFile= icudt51.dll{C82729DD-325C-49BB-8785-BC178306EFB2}INSTALLDIR2icudt51.dll17/LogFile=/LogFile=/LogFile=/LogFile= @@ -360,6 +362,8 @@ libEGL.dll{D90EF89D-15FD-4078-944E-0CD59F271DDD}INSTALLDIR2libegl.dll17/LogFile=/LogFile=/LogFile=/LogFile= libGLESv2.dll{B107C281-330A-48FE-A5B7-4FD770EF6E1E}INSTALLDIR2libglesv2.dll17/LogFile=/LogFile=/LogFile=/LogFile= qwindows.dll{A76236B1-D579-4C4B-A462-2C78D5E1D344}PLATFORMS2qwindows.dll17/LogFile=/LogFile=/LogFile=/LogFile= + zerotier_one_x64.exe{9E0F5EAD-8E4C-4BC7-B217-71A14B8BF874}ONE2zerotier_one_x64.exe17/LogFile=/LogFile=/LogFile=/LogFile= + zerotier_one_x86.exe{427F8EB7-9E68-4B66-9A95-EF4DA965219F}ONE2zerotier_one_x86.exe17/LogFile=/LogFile=/LogFile=/LogFile= @@ -1088,6 +1092,7 @@ + + @@ -1907,6 +1914,8 @@ + +
ISSelfRegisterCosting1ISSELFREG.DLLISSelfRegisterCosting ISSelfRegisterFiles3073ISSELFREG.DLLISSelfRegisterFiles ISSelfRegisterFinalize1ISSELFREG.DLLISSelfRegisterFinalize + ISSetAllUsers257SetAllUsers.dllSetAllUsers ISUnSelfRegisterFiles3073ISSELFREG.DLLISUnSelfRegisterFiles SetARPINSTALLLOCATION51ARPINSTALLLOCATION[INSTALLDIR] SetAllUsersProfileNT51ALLUSERSPROFILE[%SystemRoot]\Profiles\All Users @@ -1899,6 +1904,8 @@ AlwaysInstallQt5Widgets.dll AlwaysInstallWdfCoinstaller01011.dll AlwaysInstallWdfCoinstaller01011.dll1AlwaysInstallZeroTierOneService.Primary_outputAlwaysInstallZeroTier_One.exe AlwaysInstalldevcon_x64.exe AlwaysInstalldevcon_x86.exe AlwaysInstallicudt51.dllAlwaysInstalllibEGL.dll AlwaysInstalllibGLESv2.dll AlwaysInstallqwindows.dllAlwaysInstallzerotier_one_x64.exeAlwaysInstallzerotier_one_x86.exe
@@ -1935,6 +1944,10 @@
qwindows.dllqwindows.dllqwindows.dll01C:\Users\api\Documents\QtWin32Dlls\platforms\qwindows.dll1 wdfcoinstaller01011.dllWdfCoinstaller01011.dllWDFCOI~1.DLL|WdfCoinstaller01011.dll01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\ext\bin\tap-windows\x64\WdfCoinstaller01011.dll1 wdfcoinstaller01011.dll1WdfCoinstaller01011.dll1WDFCOI~1.DLL|WdfCoinstaller01011.dll01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\ext\bin\tap-windows\x86\WdfCoinstaller01011.dll1 + zerotier_one.exeZeroTier_One.exeZEROTI~1.EXE|ZeroTier One.exe01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\build-ZeroTierUI-Desktop_Qt_5_2_0_MSVC2012_32bit-Release\release\ZeroTier One.exe1 + zerotier_one_x64.exezerotier_one_x64.exeZEROTI~1.EXE|zerotier-one_x64.exe01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\windows\Build\x64\Release\zerotier-one_x64.exe1 + zerotier_one_x86.exezerotier_one_x86.exeZEROTI~1.EXE|zerotier-one_x86.exe01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\windows\Build\Win32\Release\zerotier-one_x86.exe1 + zerotieroneservice.primary_oZeroTierOneService.Primary_outputZeroTierOneService.Primary output01<ZeroTierOneService>|Built3 zttap200.catISX_DEFAULTCOMPONENT5zttap200.cat01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\ext\bin\tap-windows\x64\zttap200.cat1 zttap200.cat1ISX_DEFAULTCOMPONENT6zttap200.cat01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\ext\bin\tap-windows\x86\zttap200.cat1 zttap200.infISX_DEFAULTCOMPONENT5zttap200.inf01C:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\ext\bin\tap-windows\x64\zttap200.inf1 @@ -2095,6 +2108,8 @@ Qt5Widgets.dll_6CB4C7B2_E80E_4AC3_838C_6D1431F5AC93_FILTER WdfCoinstaller01011.dll_25CAA8A4_34FC_4599_94AF_0124B400A2F8_FILTER WdfCoinstaller01011.dll1_2FCC37B9_1DE6_4163_A99C_F53EA4420CCB_FILTER + ZeroTierOneService.Primary_output_406DBE6B_9F43_495C_B77A_2EA0367BB019_FILTER + ZeroTier_One.exe_E6CC054F_69F6_4B50_B5BD_108DE01DC666_FILTER devcon_x64.exe_419B108B_CB71_4DE5_ADC7_1889BE228BAC_FILTER devcon_x86.exe_02A951D7_7BF2_4D39_85EC_032CDBD9D644_FILTER icudt51.dll_3A5B57B7_E9D6_4B25_960E_DBA119CA8153_FILTER @@ -2103,6 +2118,8 @@ libEGL.dll_4C26B75E_850C_4565_AAC4_1E9576965D5E_FILTER libGLESv2.dll_DA9BD817_C07E_4558_8F11_723DDB352DEB_FILTER qwindows.dll_A5F1B009_8024_4EA9_A5B5_79E6E514A5E4_FILTER + zerotier_one_x64.exe_F5FB3564_5C0E_4347_BAD6_7B7432EA9430_FILTER + zerotier_one_x86.exe_732E3C1D_4AE4_497A_A2FB_41E122A7E144_FILTER
@@ -2411,6 +2428,8 @@ + +
ProgramFilesFolder1 SystemFolder1 WindowsFolder1ZeroTierOneZeroTierOne\ZeroTierOne.vcxproj2ZeroTierOneServiceZeroTierOneService\ZeroTierOneService.csproj2
@@ -3825,6 +3844,9 @@ + + +
ID_STRING31033contact@zerotier.com0-1599942416 ID_STRING41033https://www.zerotier.com/0-1599936272 ID_STRING51033https://www.zerotier.com/downloads.html0-1599985392ID_STRING61033ZeroTier One0287479504ID_STRING71033Ethernet Virtualization Service0287442672ID_STRING81033ZEROTI~1|ZeroTier One0287494993 IIDS_UITEXT_FeatureUninstalled1033This feature will remain uninstalled.0-1599985520
@@ -3933,6 +3955,7 @@ ISBuildSourcePath ISIconIndex ARPPRODUCTICON.exeC:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\ZeroTierUI\zt1icon.ico0 + NewShortcut1_E532AA9A6AD9437D831F39896EC72272.exeC:\Users\api\Documents\Visual Studio 2012\Projects\ZeroTierOne\build-ZeroTierUI-Desktop_Qt_5_2_0_MSVC2012_32bit-Release\release\ZeroTier One.exe0 @@ -3978,6 +4001,7 @@ - + ArgumentsWaitComponent_ +
ISSelfRegisterCosting2201 ISSelfRegisterFiles5601 ISSelfRegisterFinalize6601 + ISSetAllUsersNot Installed10 ISUnSelfRegisterFiles2202 InstallFiles4000InstallFiles InstallFinalize6600InstallFinalize @@ -4065,7 +4089,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= ISThemeInstallShield Blue.theme ISUSLock{1C46AFC4-D60A-4FD4-B53C-C2A31F763477} ISUSSignature{C55432A9-A602-4EEB-97E9-9DA69591230D}ISVisitedViewsviewAssistant,viewISToday,viewProject,viewRealSetupDesign,viewSetupDesign,viewSetupTypes,viewUpgradePaths,viewUpdateService,viewRegistry,viewUI,viewBillboards,viewTextMessages,viewSystemSearch,viewInstallScriptStd,viewCustomActions,viewSupportFiles,viewRelease,viewDesignPatches,viewAppV,viewFeatureFiles,viewServices,viewComponentServices,viewVRoots,viewEnvironmentVariables,viewFileExtensions,viewIniFiles,viewTextFiles,viewDependencies,viewObjects,viewAppFilesISVisitedViewsviewAssistant,viewISToday,viewProject,viewRealSetupDesign,viewSetupDesign,viewSetupTypes,viewUpgradePaths,viewUpdateService,viewRegistry,viewUI,viewBillboards,viewTextMessages,viewSystemSearch,viewInstallScriptStd,viewCustomActions,viewSupportFiles,viewRelease,viewDesignPatches,viewAppV,viewFeatureFiles,viewServices,viewComponentServices,viewVRoots,viewEnvironmentVariables,viewFileExtensions,viewIniFiles,viewTextFiles,viewDependencies,viewObjects,viewAppFiles,viewShortcuts Limited1 LockPermissionMode1 MsiExecCmdLineOptions @@ -4095,6 +4119,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= FileCost900FileCost FindRelatedProducts430FindRelatedProducts ISPreventDowngradeISFOUNDNEWERPRODUCTVERSION450ISPreventDowngrade + ISSetAllUsersNot Installed10 InstallWelcomeNot Installed1210InstallWelcome IsolateComponents950IsolateComponents LaunchConditionsNot Installed410LaunchConditions @@ -4123,6 +4148,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= ConditionDescription +
(Not Version9X) And (Not VersionNT=400) And (Not VersionNT=500) And (Not VersionNT=501) And (Not VersionNT=502) And (Not VersionNT=602)##IDPROP_EXPRESS_LAUNCH_CONDITION_OS##
@@ -4373,6 +4399,8 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA=
ARPCONTACT##ID_STRING3## ARPHELPLINK##ID_STRING4## ARPINSTALLLOCATION + ARPNOMODIFY1 + ARPNOREPAIR1 ARPPRODUCTICONARPPRODUCTICON.exe ARPSIZE ARPURLINFOABOUT##ID_STRING2## @@ -4441,7 +4469,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= PROGMSG_IIS_ROLLBACKAPPPOOLS##IDS_PROGMSG_IIS_ROLLBACKAPPPOOLS## PROGMSG_IIS_ROLLBACKVROOTS##IDS_PROGMSG_IIS_ROLLBACKVROOTS## PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## - ProductCode{95C68929-5113-4049-89EB-2A6185CA420B} + ProductCode{D90E635B-B81D-4F77-B3DE-515EA5E91452} ProductNameZeroTier One ProductVersion1.00.0000 ProgressType0install @@ -4458,7 +4486,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= SecureCustomPropertiesISFOUNDNEWERPRODUCTVERSION;USERNAME;COMPANYNAME;ISX_SERIALNUM;SUPPORTDIR SelectedSetupType##IDS__DisplayName_Typical## SetupTypeTypical - UpgradeCode{6F23B4B4-1AB3-4F9D-85B1-6340199C9D9D} + UpgradeCode{A61CA7BC-62B0-45F7-A86F-7CA340142B28} _IsMaintenanceChange _IsSetupTypeMinTypical
@@ -4565,6 +4593,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA=
NewEvent1ZeroTierOneService1290ZeroTierOneService.Primary_output
@@ -4581,6 +4610,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= ArgumentsComponent_Description +
NewServiceInstall1ZeroTierOneService##ID_STRING6##16232771ZeroTierOneService.Primary_output##ID_STRING7##
@@ -4603,6 +4633,7 @@ RABWAEQALQA1AAEARQB4AHAAcgBlAHMAcwA= ISCommentsISShortcutNameISAttributes +
NewShortcut1ProgramMenuFolder##ID_STRING8##ZeroTier_One.exe[INSTALLDIR]ZeroTier One.exeNewShortcut1_E532AA9A6AD9437D831F39896EC72272.exe11
diff --git a/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isproj b/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isproj index 00e6b614e..3e1e0bb57 100644 --- a/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isproj +++ b/windows/ZeroTierOneInstaller/ZeroTierOneInstaller.isproj @@ -28,4 +28,10 @@ --> + + + ZeroTierOneService + {63D28112-9A56-42FA-9C3E-EF6C58AF09B3} + + \ No newline at end of file