Fix TortoiseGitBlame build problem and update version number and changelog

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / TortoiseSVN.wxs

diff --git a/src/TortoiseGitSetup/TortoiseSVN.wxs b/src/TortoiseGitSetup/TortoiseSVN.wxs
index 3731674..dca357b 100644 (file)
--- a/src/TortoiseGitSetup/TortoiseSVN.wxs
+++ b/src/TortoiseGitSetup/TortoiseSVN.wxs
@@ -4,12 +4,12 @@
        <Product\r
        UpgradeCode="$(var.UpgradeGuid)"\r
        Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"\r
-       Id="EB66C774-5CFC-41f6-9C03-CE4F9037150A"\r
+       Id="*"\r
        Version="$(var.VersionNumberInternal)"\r
        Manufacturer="TortoiseGit"\r
        Language="1033">\r
                <Package\r
-               Id="82B77BC3-0ACD-4a53-A34F-3F203E59D51A"\r
+               Id="*"\r
                Keywords="$(var.PackageKeywords)"\r
                Description="$(var.PackageDescription)"\r
                Comments="$(var.PackageComments)"\r
@@ -25,14 +25,15 @@
                        <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" 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
@@ -67,7 +68,7 @@
                \r
 \r
     <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
-               <Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
+               <Binary Id="CustomActionsDLL" SourceFile="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
 \r
                <!-- Unsafe-check properties and custom actions .......................................................................... -->\r
                <Property Id="VSDUIANDADVERTISED">This advertised application will not be installed because it might be unsafe. Contact your administrator to change the installation user interface option of the package to basic.</Property>\r
@@ -86,6 +87,7 @@
                </Property>\r
                <?endif ?>\r
     \r
+       \r
     <?include FeaturesFragment.wxi?>\r
     <?include StructureFragment.wxi?>\r
     <?include UIFragment.wxi?>\r
@@ -104,12 +106,11 @@
                        <AppSearch Sequence="1"></AppSearch>\r
                        <LaunchConditions After="AppSearch" />\r
                        <Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>\r
-      <!--\r
-                       <RemoveExistingProducts After="FindRelatedProducts"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
-      -->\r
-      <!--\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
+      \r
                        <ScheduleReboot After="RegisterProduct" />\r
                </InstallExecuteSequence>\r
 \r