Merge pull request #217 from Hirogen/master

update Innosetup with correct folders
zarunbal · Mar 27, 2022 · f839adc · f839adc
2 parents 0c6646f + fafaf1a
commit f839adc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git 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
@@ -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)]
diff --git 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]