From fafaf1ac0b2717436fc58e0bb90dd64a34c74dbf Mon Sep 17 00:00:00 2001 From: Hirogen Date: Sun, 27 Mar 2022 15:05:02 +0200 Subject: [PATCH] update Innosetup with correct folders --- build/Build.cs | 6 ------ src/Solution Items/AssemblyVersion.cs | 8 ++++---- src/setup/LogExpertInstaller.iss | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index 8aa70116..603810d2 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -4,13 +4,8 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using JetBrains.Annotations; -using Nuke.Common.Tools.DotCover; -using Nuke.Common.Tools.ReportGenerator; -using Microsoft.Build.Execution; using Nuke.Common; using Nuke.Common.CI.AppVeyor; -using Nuke.Common.CI.AppVeyor.Configuration; using Nuke.Common.Execution; using Nuke.Common.Git; using Nuke.Common.IO; @@ -20,7 +15,6 @@ using Nuke.Common.Tools.DotNet; using Nuke.Common.Tools.GitVersion; using Nuke.Common.Tools.NuGet; -using Nuke.Common.Tools.NUnit; using Nuke.Common.Utilities.Collections; using Nuke.GitHub; using static Nuke.Common.EnvironmentInfo; diff --git a/src/Solution Items/AssemblyVersion.cs b/src/Solution Items/AssemblyVersion.cs index 2b4ebba2..9124da0a 100644 --- a/src/Solution Items/AssemblyVersion.cs +++ b/src/Solution Items/AssemblyVersion.cs @@ -3,10 +3,10 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("LogExpert")] -[assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2017 Zarunbal")] +[assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2022 Zarunbal|Hirogen")] -[assembly: AssemblyVersion("1.8.0")] -[assembly: AssemblyFileVersion("1.8.0")] -[assembly: AssemblyInformationalVersion("1.8.0")] +[assembly: AssemblyVersion("1.8.8")] +[assembly: AssemblyFileVersion("1.8.8")] +[assembly: AssemblyInformationalVersion("1.8.8")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/src/setup/LogExpertInstaller.iss b/src/setup/LogExpertInstaller.iss index 238a7a41..ed58813f 100644 --- a/src/setup/LogExpertInstaller.iss +++ b/src/setup/LogExpertInstaller.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define AppName "LogExpert" -#define AppVersion "1.8" +#define AppVersion "1.8.8-PRERelease" #define AppURL "https://github.com/zarunbal/LogExpert" #define AppExeName "LogExpert.exe" @@ -57,15 +57,16 @@ Name: "german"; MessagesFile: "compiler:Languages\German.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "..\..\bin\SetupFiles\LogExpert.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\SetupFiles\Licenses\*"; DestDir: "{app}\Licenses\"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\..\bin\SetupFiles\plugins\*"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs -Source: "..\..\bin\SetupFiles\ColumnizerLib.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\SetupFiles\CookComputing.XmlRpcV2.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\SetupFiles\LogExpert.exe.config"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\SetupFiles\NLog.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\SetupFiles\Start.cmd"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\SetupFiles\WeifenLuo.WinFormsUI.Docking.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\LogExpert.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\Licenses\*"; DestDir: "{app}\Licenses\"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\bin\Release\plugins\*"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\bin\Release\pluginsx86\*"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\..\bin\Release\ColumnizerLib.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\CookComputing.XmlRpcV2.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\LogExpert.exe.config"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\NLog.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\Start.cmd"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Release\WeifenLuo.WinFormsUI.Docking.dll"; DestDir: "{app}"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons]