Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ protected override void OnBuildInitialized ()
});

Target CreateSetup => _ => _
.DependsOn(CopyFilesForSetup, ChangeVersionNumber, Compile)
.DependsOn(CopyFilesForSetup, ChangeVersionNumber, Compile, CopyLicenses)
.Before(Publish)
.After(GeneratePluginHashes)
.OnlyWhenStatic(() => Configuration == Configuration.Release)
Expand All @@ -365,7 +365,7 @@ protected override void OnBuildInitialized ()

if (!executed)
{
Assert.True(true, "Inno setup was not found");
Assert.Fail("Inno setup was not found");
}
});

Expand Down Expand Up @@ -506,7 +506,7 @@ private void ExecuteInnoSetup (AbsolutePath innoPath)
proc.StartInfo = new ProcessStartInfo(innoPath, $"{SetupCommandLineParameter} \"{InnoSetupScript}\"");
if (!proc.Start())
{
Assert.True(true, $"Failed to start {innoPath} with \"{SetupCommandLineParameter}\" \"{InnoSetupScript}\"");
Assert.Fail($"Failed to start {innoPath} with \"{SetupCommandLineParameter}\" \"{InnoSetupScript}\"");
}

proc.WaitForExit();
Expand All @@ -515,7 +515,7 @@ private void ExecuteInnoSetup (AbsolutePath innoPath)

if (proc.ExitCode != 0)
{
Assert.True(true, $"Error during execution of {innoPath}, exitcode {proc.ExitCode}");
Assert.Fail($"Error during execution of {innoPath}, exitcode {proc.ExitCode}");
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/ColumnizerLib/ColumnizerLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>

<RootNamespace>ColumnizerLib</RootNamespace>

<PackageId>LogExpert.ColumnizerLib</PackageId>
</PropertyGroup>

<ItemGroup>
Expand Down
14 changes: 3 additions & 11 deletions src/setup/LogExpertInstaller.iss
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,15 @@ Source: "{#ReleaseFolder}\pluginsx86\ColumnizerLib.dll"; DestDir: "{app}\plugins
Source: "{#ReleaseFolder}\pluginsx86\ColumnizerLib.xml"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion

Source: "{#ReleaseFolder}\plugins\BouncyCastle.Cryptography.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\Microsoft.Extensions.DependencyInjection.Abstractions"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\Microsoft.Extensions.DependencyInjection.Abstractions"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\Microsoft.Extensions.DependencyInjection.Abstractions.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\Microsoft.Extensions.DependencyInjection.Abstractions.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\Microsoft.Extensions.Logging.Abstractions.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\Microsoft.Extensions.Logging.Abstractions.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs

Source: "{#ReleaseFolder}\plugins\Newtonsoft.Json.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\Newtonsoft.Json.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs

Source: "{#ReleaseFolder}\plugins\Microsoft.Bcl.HashCode.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\Renci.SshNet.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\System.Memory.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\System.Numerics.Vectors.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\System.Runtime.CompilerServices.Unsafe.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\System.Threading.Tasks.Extensions.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs

Source: "{#ReleaseFolder}\plugins\DefaultPlugins.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\FlashIconHighlighter.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Expand All @@ -129,8 +124,6 @@ Source: "{#ReleaseFolder}\plugins\RegexColumnizer.dll"; DestDir: "{app}\plugins\
Source: "{#ReleaseFolder}\plugins\de\RegexColumnizer.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
Source: "{#ReleaseFolder}\plugins\RegexColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs

Source: "{#ReleaseFolder}\plugins\LogExpert.Core.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion

; DLLS for SFTP Support
Source: "{#ReleaseFolder}\plugins\SftpFileSystem.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\SftpFileSystem.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
Expand All @@ -139,7 +132,6 @@ Source: "{#ReleaseFolder}\pluginsx86\SftpFileSystem.Resources.dll"; DestDir: "{a
Source: "{#ReleaseFolder}\plugins\de\SftpFileSystem.Resources.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
Source: "{#ReleaseFolder}\pluginsx86\de\SftpFileSystem.Resources.resources.dll"; DestDir: "{app}\pluginsx86\de\"; Flags: ignoreversion
Source: "{#ReleaseFolder}\plugins\SftpFileSystem.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\SftpFileSystem.manifest.json"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\plugins\Renci.SshNet.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#ReleaseFolder}\pluginsx86\Renci.SshNet.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs

Expand All @@ -161,6 +153,7 @@ Source: "{#ReleaseFolder}\LogExpert.Resources.dll"; DestDir: "{app}"; Flags: ign
Source: "{#ReleaseFolder}\de\LogExpert.Resources.resources.dll"; DestDir: "{app}\de\"; Flags: ignoreversion
Source: "{#ReleaseFolder}\LogExpert.PluginRegistry.dll"; DestDir: "{app}"; Flags: ignoreversion

Source: "{#ReleaseFolder}\System.CommandLine.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\NuGet.Versioning.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\LogExpert.xml"; DestDir: "{app}"; Flags: ignoreversion
Expand All @@ -170,7 +163,6 @@ Source: "{#ReleaseFolder}\Start.cmd"; DestDir: "{app}"; Flags: ignoreversion
; Vanara libs for Pinvoke => https://github.com/dahall/Vanara
Source: "{#ReleaseFolder}\fr\Vanara.Core.resources.dll"; DestDir: "{app}\fr\"; Flags: ignoreversion
Source: "{#ReleaseFolder}\Vanara.Core.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\Vanara.PInvoke.Shared.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\Vanara.PInvoke.ComCtl32.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\Vanara.PInvoke.Cryptography.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#ReleaseFolder}\Vanara.PInvoke.Gdi32.dll"; DestDir: "{app}"; Flags: ignoreversion
Expand Down
Loading