github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG-2091: Fixed a missing configuration for the .zip version of Greenshot, this means the logger was configured wrong.

Browse source
This commit is contained in:
Robin 2016-12-29 20:59:27 +01:00
parent fbba70fce4
commit 08d28ff640
3 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Greenshot/log4net-zip.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<log4net>
<appender name="FileAppender" type="log4net.Appender.RollingFileAppender">
<file value="Greenshot.log" />
<encoding value="utf-8" />
<appendToFile value="true" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="3" />
<maximumFileSize value="1MB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{ISO8601} [%thread] %-5level - [%logger] %m%n%exception" />
</layout>
</appender>
<root>
<level value="ERROR" />
<appender-ref ref="FileAppender" />
</root>
</log4net>
</configuration>

1
Greenshot/releases/additional_files/readme.txt.template
View file

@ -13,6 +13,7 @@ All details to our tickets can be found here: https://greenshot.atlassian.net
* BUG-2079 Problem with authentication in JIRA plugin * BUG-2079 Problem with authentication in JIRA plugin
* BUG-2080 Exception when opening the context menu * BUG-2080 Exception when opening the context menu
* BUG-2089 Greenshot crashes when hotkey registration fails and OneDrive is not installed * BUG-2089 Greenshot crashes when hotkey registration fails and OneDrive is not installed
* BUG-2091 Greenshot .zip version has wrong log configuration
* FEATURE-992 Open Greenshot in foreground * FEATURE-992 Open Greenshot in foreground
* FEATURE-995 Setting to paste new images inside greenshot based on cursor location * FEATURE-995 Setting to paste new images inside greenshot based on cursor location
* FEATURE-998 Open Last Capture File should select/jump to the file * FEATURE-998 Open Last Capture File should select/jump to the file

3
build.ps1
View file

@ -215,8 +215,11 @@ Function PackageZip {
"$sourcebase\GreenshotPlugin.dll", "$sourcebase\GreenshotPlugin.dll",
"$sourcebase\LinqBridge.dll", "$sourcebase\LinqBridge.dll",
"$sourcebase\log4net.dll", "$sourcebase\log4net.dll",
"$sourcebase\log4net-zip.xml"
"$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destzip\" } "$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destzip\" }
Rename-Item "$destzip\log4net-zip.xml" "$destzip\log4net.xml"
$zipOutput = "$(get-location)\zip" $zipOutput = "$(get-location)\zip"
$zip7 = "$(get-location)\greenshot\tools\7zip\7za.exe" $zip7 = "$(get-location)\greenshot\tools\7zip\7za.exe"
$arguments = @('a', '-mx9', '-tzip', '-r', "$destbase\Greenshot-NO-INSTALLER-$fileversion.zip", "$destzip\*") $arguments = @('a', '-mx9', '-tzip', '-r', "$destbase\Greenshot-NO-INSTALLER-$fileversion.zip", "$destzip\*")