Added Uninstall option.

Renamed Startup shortcut

diff --git a/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
index 89b741a..54fedc8 100644 (file)
--- a/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
+++ b/trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
@@ -21,6 +21,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_220D09CEABB240EFBF5BB44F9D29E4C7"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_263B85E7C62D146E20358A3F08BBC740"
         "OwnerKey" = "8:_A611766CD2793378FFAB2F3063F81496"
         "MsmSig" = "8:_UNDEFINED"
@@ -201,7 +207,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_B49160FDF21C82F60E2F28FF690673F7"
+        "MsmKey" = "8:_A952570414DA4B8547D9CD8FEE174CD1"
         "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -604,6 +610,26 @@
         }
         "File"
         {
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_220D09CEABB240EFBF5BB44F9D29E4C7"
+            {
+            "SourcePath" = "8:..\\uninstall.cmd"
+            "TargetName" = "8:uninstall.cmd"
+            "Tag" = "8:"
+            "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
+            "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:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_263B85E7C62D146E20358A3F08BBC740"
             {
             "AssemblyRegister" = "3:1"
@@ -945,7 +971,7 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B49160FDF21C82F60E2F28FF690673F7"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A952570414DA4B8547D9CD8FEE174CD1"
             {
             "SourcePath" = "8:Pithos.ShellExtensions.tlb"
             "TargetName" = "8:Pithos.ShellExtensions.tlb"
@@ -1376,7 +1402,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
         "ProductCode" = "8:{B83227E8-A064-475F-9BC8-38BBFBC55AB8}"
-        "PackageCode" = "8:{DD9A6ECF-274E-41F9-9B5E-00B77D45DF24}"
+        "PackageCode" = "8:{7FE3E24C-8949-4EE2-9401-B9E36F09697E}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -3578,7 +3604,7 @@
         {
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_0F2E1C05BA3C46DBA7A43E1B2F98530F"
             {
-            "Name" = "8:Pithos"
+            "Name" = "8:Startup Pithos"
             "Arguments" = "8:startup"
             "Description" = "8:"
             "ShowCmd" = "3:1"
@@ -3604,6 +3630,20 @@
             "Icon" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
             "Feature" = "8:"
             }
+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_827426DF5F844E798ADDF8D471AE42D4"
+            {
+            "Name" = "8:Uninstall Pithos"
+            "Arguments" = "8:[ProductCode]"
+            "Description" = "8:"
+            "ShowCmd" = "3:1"
+            "IconIndex" = "3:32512"
+            "Transitive" = "11:FALSE"
+            "Target" = "8:_220D09CEABB240EFBF5BB44F9D29E4C7"
+            "Folder" = "8:_FE8EA18DF1CB49179367FE453762E9B5"
+            "WorkingFolder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
+            "Icon" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+            "Feature" = "8:"
+            }
         }
         "UserInterface"
         {

diff --git a/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
index e8a4ab3..aeff57c 100644 (file)
--- a/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
+++ b/trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj
@@ -195,14 +195,14 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_A952570414DA4B8547D9CD8FEE174CD1"
+        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B49160FDF21C82F60E2F28FF690673F7"
-        "OwnerKey" = "8:_1BD6A9CD577C40098C968C8B464A03BC"
+        "MsmKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -345,6 +345,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_F73E036AFAC54F8DB99B8194DE4F11A9"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FA76529F78D7D6108EDBA33F19836A6B"
         "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
@@ -945,7 +951,7 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B49160FDF21C82F60E2F28FF690673F7"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A952570414DA4B8547D9CD8FEE174CD1"
             {
             "SourcePath" = "8:Pithos.ShellExtensions.tlb"
             "TargetName" = "8:Pithos.ShellExtensions.tlb"
@@ -1213,6 +1219,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F73E036AFAC54F8DB99B8194DE4F11A9"
+            {
+            "SourcePath" = "8:..\\uninstall.cmd"
+            "TargetName" = "8:uninstall.cmd"
+            "Tag" = "8:"
+            "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
+            "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:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA76529F78D7D6108EDBA33F19836A6B"
             {
             "AssemblyRegister" = "3:1"
@@ -1347,6 +1373,17 @@
                 {
                 }
             }
+            "{1525181F-901A-416C-8A58-119130FE478E}:_F32AADBB16424EF1832016A76E4D2481"
+            {
+            "Name" = "8:#1914"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:SystemFolder"
+                "Folders"
+                {
+                }
+            }
             "{3C67513D-01DD-4637-8A68-80971EB9504F}:_FA3E4362540D4C76A5914763C178A3BD"
             {
             "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
@@ -1376,7 +1413,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
         "ProductCode" = "8:{EB522759-1C60-4F3E-8B4A-4CE50A7FD0D7}"
-        "PackageCode" = "8:{FF62B781-2B1F-42DC-AF9D-DF8F98A74D95}"
+        "PackageCode" = "8:{DE924391-4599-4DAA-B3B9-DE51D1A1E459}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -3576,9 +3613,23 @@
         }
         "Shortcut"
         {
+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_615B568B3A3F4495ADEE5E61FAF74447"
+            {
+            "Name" = "8:Uninstall Pithos"
+            "Arguments" = "8:[ProductCode]"
+            "Description" = "8:"
+            "ShowCmd" = "3:1"
+            "IconIndex" = "3:32512"
+            "Transitive" = "11:FALSE"
+            "Target" = "8:_F73E036AFAC54F8DB99B8194DE4F11A9"
+            "Folder" = "8:_9ED8CC47C48243A0B5686A7CE582CDA3"
+            "WorkingFolder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
+            "Icon" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+            "Feature" = "8:"
+            }
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_A3A3576A3045413187297629A3EA0042"
             {
-            "Name" = "8:Pithos"
+            "Name" = "8:Startup Pithos"
             "Arguments" = "8:startup"
             "Description" = "8:"
             "ShowCmd" = "3:1"

diff --git a/trunk/uninstall.cmd b/trunk/uninstall.cmd
new file mode 100644 (file)
index 0000000..1549b97
--- /dev/null
+++ b/trunk/uninstall.cmd
@@ -0,0 +1,2 @@
+@echo off
+msiexec /x %1
\ No newline at end of file