diff --git a/BrowserProxy/BrowserProxy.rc b/BrowserProxy/BrowserProxy.rc index c093fa0..c4ff0d8 100644 Binary files a/BrowserProxy/BrowserProxy.rc and b/BrowserProxy/BrowserProxy.rc differ diff --git a/FlashProxy/FlashProxy.rc b/FlashProxy/FlashProxy.rc index d372fe9..9868ffd 100644 Binary files a/FlashProxy/FlashProxy.rc and b/FlashProxy/FlashProxy.rc differ diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj index cfad3cd..a823b6c 100644 --- a/Installer/Installer.vdproj +++ b/Installer/Installer.vdproj @@ -664,7 +664,7 @@ "Object" = "8:_DCB8C5614D354C1382F77CC686409025" "FileType" = "3:2" "InstallAction" = "3:4" - "Arguments" = "8:--path \"[TARGETDIR] \" --unregister" + "Arguments" = "8:--path \"[TARGETDIR] \" --clean --unregister" "EntryPoint" = "8:" "Sequence" = "3:1" "Identifier" = "8:_DCE4EB7E_877D_4DB2_B221_FBD3C2EB1432" @@ -678,7 +678,7 @@ "Object" = "8:_DCB8C5614D354C1382F77CC686409025" "FileType" = "3:2" "InstallAction" = "3:1" - "Arguments" = "8:--path \"[TARGETDIR] \" --pause --patch --register --startmenu --desktop=[CHECKBOXDESKTOP]" + "Arguments" = "8:--path \"[TARGETDIR] \" --clean --register --pause" "EntryPoint" = "8:" "Sequence" = "3:1" "Identifier" = "8:_138AEFC1_AFE0_4773_A9D3_70535243642C" @@ -2855,15 +2855,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ThereEdge" - "ProductCode" = "8:{7CA003BA-9809-499F-B459-535CBE33EF6A}" - "PackageCode" = "8:{BE16A437-C162-42C9-AEDF-50168263DB94}" + "ProductCode" = "8:{9C848E12-412E-487B-9A4C-29D8A64F7BBD}" + "PackageCode" = "8:{E7B6E825-26D9-40CD-8B2B-B5712293300B}" "UpgradeCode" = "8:{887059E3-E645-44A2-AE95-E602E27BD74F}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.0.9" + "ProductVersion" = "8:1.1.0" "Manufacturer" = "8:Hmph!" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -3422,7 +3422,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:Create a desktop icon" + "Value" = "8:Install MiniMap extension" "DefaultValue" = "8:#1234" "UsePlugInResources" = "11:TRUE" } @@ -3435,7 +3435,7 @@ "ContextData" = "8:Public" "Attributes" = "3:2" "Setting" = "3:2" - "Value" = "8:CHECKBOXDESKTOP" + "Value" = "8:CHECKBOXMINIMAP" "DefaultValue" = "8:CHECKBOXA1" "UsePlugInResources" = "11:TRUE" } @@ -3448,7 +3448,7 @@ "ContextData" = "8:Unchecked=;Checked=1" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:" + "Value" = "8:1" "DefaultValue" = "8:" "UsePlugInResources" = "11:TRUE" } @@ -3474,7 +3474,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:Install MiniMap extension" + "Value" = "8:Install Command Bar extension" "DefaultValue" = "8:#1235" "UsePlugInResources" = "11:TRUE" } @@ -3487,7 +3487,7 @@ "ContextData" = "8:Public" "Attributes" = "3:2" "Setting" = "3:2" - "Value" = "8:CHECKBOXMINIMAP" + "Value" = "8:CHECKBOXCOMMANDBAR" "DefaultValue" = "8:CHECKBOXA2" "UsePlugInResources" = "11:TRUE" } @@ -3500,7 +3500,7 @@ "ContextData" = "8:Unchecked=;Checked=1" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:" + "Value" = "8:1" "DefaultValue" = "8:" "UsePlugInResources" = "11:TRUE" } @@ -3526,7 +3526,7 @@ "ContextData" = "8:" "Attributes" = "3:0" "Setting" = "3:2" - "Value" = "8:Install Command Bar extension" + "Value" = "8:Checkbox3" "DefaultValue" = "8:#1236" "UsePlugInResources" = "11:TRUE" } @@ -3539,7 +3539,7 @@ "ContextData" = "8:Public" "Attributes" = "3:2" "Setting" = "3:2" - "Value" = "8:CHECKBOXCOMMANDBAR" + "Value" = "8:CHECKBOXA3" "DefaultValue" = "8:CHECKBOXA3" "UsePlugInResources" = "11:TRUE" } @@ -3565,7 +3565,7 @@ "ContextData" = "8:1;True=1;False=0" "Attributes" = "3:0" "Setting" = "3:0" - "Value" = "3:1" + "Value" = "3:0" "DefaultValue" = "3:1" "UsePlugInResources" = "11:TRUE" } diff --git a/SetupThereEdge/version.py b/SetupThereEdge/version.py index be7b72d..b0e066c 100644 --- a/SetupThereEdge/version.py +++ b/SetupThereEdge/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -VERSION = '1.0.9' \ No newline at end of file +VERSION = '1.1.0' \ No newline at end of file diff --git a/SetupThereEdge/version.rs b/SetupThereEdge/version.rs index a78a094..7cc30c6 100644 --- a/SetupThereEdge/version.rs +++ b/SetupThereEdge/version.rs @@ -2,8 +2,8 @@ # VSVersionInfo( ffi=FixedFileInfo( - filevers=(1, 0, 9, 0), - prodvers=(1, 0, 9, 0), + filevers=(1, 1, 0, 0), + prodvers=(1, 1, 0, 0), mask=0x3f, flags=0x0, OS=0x40004, @@ -16,12 +16,12 @@ VSVersionInfo( StringTable(u'040904b0', [ StringStruct(u'CompanyName', u'Hmph!'), StringStruct(u'FileDescription', u'Setup helper for There Edge'), - StringStruct(u'FileVersion', u'1.0.9.0'), + StringStruct(u'FileVersion', u'1.1.0.0'), StringStruct(u'InternalName', u'SetupThereEdge.exe'), StringStruct(u'LegalCopyright', u'(c) Hmph!'), StringStruct(u'OriginalFilename', u'SetupThereEdge.exe'), StringStruct(u'ProductName', u'There Edge Setup Helper'), - StringStruct(u'ProductVersion', u'1.0.9.0') + StringStruct(u'ProductVersion', u'1.1.0.0') ]) ]), VarFileInfo([