<Product\r
UpgradeCode="$(var.UpgradeGuid)"\r
Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"\r
- Id="????????-????-????-????-????????????"\r
+ Id="EB66C774-5CFC-41f6-9C03-CE4F9037150A"\r
Version="$(var.VersionNumberInternal)"\r
- Manufacturer="TortoiseSVN"\r
+ Manufacturer="TortoiseGit"\r
Language="1033">\r
<Package\r
- Id="????????-????-????-????-????????????"\r
+ Id="82B77BC3-0ACD-4a53-A34F-3F203E59D51A"\r
Keywords="$(var.PackageKeywords)"\r
Description="$(var.PackageDescription)"\r
Comments="$(var.PackageComments)"\r
Manufacturer="$(var.PackageManufacturer)"\r
InstallerVersion="300"\r
- Platforms="$(var.PackagePlatforms)"\r
+ Platform="$(var.PackagePlatforms)"\r
Languages="1033"\r
Compressed="yes"\r
SummaryCodepage="1252"/>\r
<UpgradeVersion Property="NEWERVERSIONDETECTED" Minimum="$(var.VersionNumberInternal)" OnlyDetect="yes" />\r
\r
<!-- flag is set if the install will trigger an upgrade of an existing install -->\r
+ <!--\r
<UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Maximum="$(var.VersionNumberInternal)" IncludeMaximum="no" />\r
- </Upgrade>\r
+ --></Upgrade>\r
\r
<Media Id="1" Cabinet="TSVN.cab" EmbedCab="yes" CompressionLevel="high" />\r
\r
- <Icon Id="TSVNIcon" src="..\Resources\Tortoise.ico" />\r
+ <Icon Id="TSVNIcon" SourceFile="..\Resources\Tortoise.ico" />\r
\r
+ <Property Id="SSHRadio">Plink</Property>\r
+ \r
<!-- Launch Condition related properties ................................................................................. -->\r
<Property Id="VERSIONIE">\r
<RegistrySearch Id="RegSearchIeVersion" Root="HKLM" Key="SOFTWARE\Microsoft\Internet Explorer" Name="Version" Type="raw" Win64="$(var.Win64YesNo)"/>\r
</Property>\r
<Condition Message="[ProductName] needs at least Internet Explorer 5">NOT ((VERSIONIE<<"1") OR (VERSIONIE<<"2") OR (VERSIONIE<<"3") OR (VERSIONIE<<"4"))</Condition>\r
\r
- <?if $(env.Platform) = "win32" ?>\r
+ <?if $(var.Platform) = "win32" ?>\r
<Property Id="GDIPLUSINSTALLED">\r
<DirectorySearch Id="WND" Path="[SystemFolder]">\r
<FileSearch LongName="GDIPlus.dll" />\r
</Property>\r
<CustomAction Id="Set_ShowChangelog" Property="ShowChangelog" Value="Yes" Return="check" />\r
<CustomAction Id="ShowChangelogAction" Property="TEXTEDITOR" ExeCommand="[INSTALLDIR]changelog.txt" Return="asyncNoWait" />\r
- <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
- <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
+ \r
+ <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
+ \r
+\r
+ <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
<Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
\r
<!-- Unsafe-check properties and custom actions .......................................................................... -->\r
<CustomAction Id="ERRCA_UIANDADVERTISED" Error="[VSDUIANDADVERTISED]" />\r
\r
<!-- Figure out where a previous installation was, if any ................................................................ -->\r
- <?if $(env.Platform) = "x64" ?>\r
+ <?if $(var.Platform) = "x64" ?>\r
<CustomAction Id="DefaultTargetDir" Property="INSTALLDIR" Value="[ProgramFiles64Folder]$(var.ProductName)" Execute="immediate" />\r
<Property Id="INSTALLDIR">\r
<RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
<RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
</Property>\r
<?endif ?>\r
-\r
+ \r
+ \r
+ <?include FeaturesFragment.wxi?>\r
+ <?include StructureFragment.wxi?>\r
+ <?include UIFragment.wxi?>\r
+ \r
+ <!--\r
<FragmentRef Id="StructureFragment"/>\r
\r
<FragmentRef Id="FeaturesFragment" />\r
\r
<FragmentRef Id="UIFragment" />\r
-\r
+ -->\r
<!-- Execute Sequencing ................................................................................................. -->\r
<AdminExecuteSequence />\r
<InstallExecuteSequence>\r
<AppSearch Sequence="1"></AppSearch>\r
<LaunchConditions After="AppSearch" />\r
<Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>\r
- <RemoveExistingProducts After="FindRelatedProducts"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
- <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+ \r
+ <RemoveExistingProducts After="InstallFinalize"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
+ \r
+ <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+ \r
<ScheduleReboot After="RegisterProduct" />\r
</InstallExecuteSequence>\r
\r