OSDN Git Service

Fix setup will launch old version msi to remove old version.
authorFrank Li <lznuaa@gmail.com>
Wed, 22 Apr 2009 02:24:22 +0000 (10:24 +0800)
committerFrank Li <lznuaa@gmail.com>
Wed, 22 Apr 2009 02:24:22 +0000 (10:24 +0800)
Directly update to new version without remove old version.

Signed-off-by: Frank Li <lznuaa@gmail.com>
ext/libintl/libintl3-win32/bin/intl3_tsvn.dll [new file with mode: 0644]
ext/libintl/libintl3-x64/bin/intl3_tsvn.dll [new file with mode: 0644]
src/TortoiseGitSetup/TortoiseSVN.wxs
src/TortoiseGitSetup/VersionNumberInclude.wxi

diff --git a/ext/libintl/libintl3-win32/bin/intl3_tsvn.dll b/ext/libintl/libintl3-win32/bin/intl3_tsvn.dll
new file mode 100644 (file)
index 0000000..95c094a
Binary files /dev/null and b/ext/libintl/libintl3-win32/bin/intl3_tsvn.dll differ
diff --git a/ext/libintl/libintl3-x64/bin/intl3_tsvn.dll b/ext/libintl/libintl3-x64/bin/intl3_tsvn.dll
new file mode 100644 (file)
index 0000000..7376c6e
Binary files /dev/null and b/ext/libintl/libintl3-x64/bin/intl3_tsvn.dll differ
index c7201f0..abe094b 100644 (file)
@@ -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,9 +25,8 @@
                        <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
index d3be647..d51ecbd 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
-       <?define MinorVersion="5" ?>\r
-       <?define MicroVersion="1" ?>\r
-       <?define BuildVersion="0" ?>\r
+       <?define MinorVersion="6" ?>\r
+       <?define MicroVersion="0" ?>\r
+       <?define BuildVersion="1" ?>\r
 </Include>\r