Fix to allow Greenshot to run as a portable App, installer will hopefully be made this week...

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2577 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-04-22 13:30:38 +00:00
commit 791140101a
3 changed files with 23 additions and 24 deletions

View file

@ -6,5 +6,8 @@
</startup>
<runtime>
<loadFromRemoteSources enabled="true"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="App\Greenshot"/>
</assemblyBinding>
</runtime>
</configuration>

View file

@ -28,8 +28,6 @@ namespace Greenshot {
/// Description of Main.
/// </summary>
public class GreenshotMain {
private const string PAF_PATH = @"App\Greenshot";
static GreenshotMain() {
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
}
@ -49,8 +47,6 @@ namespace Greenshot {
[STAThread]
public static void Main(string[] args) {
// Needed to make Greenshot portable, the path should be appended before the DLL's are loaded!!
AppDomain.CurrentDomain.AppendPrivatePath(PAF_PATH);
MainForm.Start(args);
}
}

View file

@ -4,7 +4,7 @@
<!-- See http://logging.apache.org/log4net/release/sdk/log4net.Layout.PatternLayout.html -->
<log4net>
<appender name="FileAppender" type="log4net.Appender.RollingFileAppender">
<file value="Greenshot.log" />
<file value="Data\Greenshot\Greenshot.log" />
<encoding value="utf-8" />
<appendToFile value="true" />
<rollingStyle value="Size" />
@ -16,7 +16,7 @@
</layout>
</appender>
<root>
<level value="INFO" />
<level value="ERROR" />
<appender-ref ref="FileAppender" />
</root>
</log4net>