From cf492530b23045365f985cefc082230984a241a8 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 23 May 2020 14:40:27 +0100 Subject: [PATCH] Changed: updated version numbers --- Installer/Installer.vdproj | 42 ++++++++++++++++++++++---------- Properties/AssemblyInfo.cs | 2 +- Windows/Forms/Tile/TTilePanel.cs | 2 -- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/Installer/Installer.vdproj b/Installer/Installer.vdproj index 21223c0..a038fed 100644 --- a/Installer/Installer.vdproj +++ b/Installer/Installer.vdproj @@ -21,7 +21,7 @@ } "Entry" { - "MsmKey" = "8:_319FB8AF11673FA1DE35F32F28006014" + "MsmKey" = "8:_348F38381A436B17ED9D498F7B85293B" "OwnerKey" = "8:_DF30C536B54F4789A5D9483F1711C32F" "MsmSig" = "8:_UNDEFINED" } @@ -34,19 +34,19 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_06453D777CDCC5417ED9D2B4550F24E9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_DF30C536B54F4789A5D9483F1711C32F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_319FB8AF11673FA1DE35F32F28006014" + "OwnerKey" = "8:_348F38381A436B17ED9D498F7B85293B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_06453D777CDCC5417ED9D2B4550F24E9" "MsmSig" = "8:_UNDEFINED" } } @@ -67,6 +67,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { @@ -83,6 +91,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -143,14 +159,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_319FB8AF11673FA1DE35F32F28006014" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_348F38381A436B17ED9D498F7B85293B" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" "ScatterAssemblies" { - "_319FB8AF11673FA1DE35F32F28006014" + "_348F38381A436B17ED9D498F7B85293B" { "Name" = "8:Newtonsoft.Json.dll" "Attributes" = "3:512" @@ -230,15 +246,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Fizzy Launcher" - "ProductCode" = "8:{7A71598F-054E-4C67-B36B-7748F9980545}" - "PackageCode" = "8:{C8B03E34-EB01-4DC4-A305-9BF6414006A2}" + "ProductCode" = "8:{7CAF68BE-7E5A-4EE3-96E3-D39781DD3330}" + "PackageCode" = "8:{AB19C030-EFEA-4954-8571-065CE113F0B5}" "UpgradeCode" = "8:{7D53FD1D-34E0-4146-817B-8794A9178FCE}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:FALSE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.1.1.107" + "ProductVersion" = "8:0.1.1.108" "Manufacturer" = "8:Hi, I'm Ray" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://www.hiimray.co.uk/software-fizzy-launcher" diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 11696d9..0be6320 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.1.1.107")] +[assembly: AssemblyFileVersion("0.1.1.108")] diff --git a/Windows/Forms/Tile/TTilePanel.cs b/Windows/Forms/Tile/TTilePanel.cs index eb4f75a..8136700 100644 --- a/Windows/Forms/Tile/TTilePanel.cs +++ b/Windows/Forms/Tile/TTilePanel.cs @@ -297,8 +297,6 @@ namespace AppLauncher.Windows.Forms return (item as MainForm); } } - - return null; } private void toolItem_Click(object sender, EventArgs e)