github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 05:53:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a Greenshot.exe.config to allow running under .NET 4.0 and later.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1672 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-02-21 09:16:16 +00:00
commit 4a07359cf6
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Greenshot/Greenshot.csproj
View file

@ -194,6 +194,9 @@
<Compile Include="Helpers\OfficeInterop\ExcelWrapper.cs" /> <Compile Include="Helpers\OfficeInterop\ExcelWrapper.cs" />
<Compile Include="Helpers\ProcessorHelper.cs" /> <Compile Include="Helpers\ProcessorHelper.cs" />
<Compile Include="Processors\TitleFixProcessor.cs" /> <Compile Include="Processors\TitleFixProcessor.cs" />
<None Include="Greenshot.exe.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Helpers\OfficeInterop\OutlookUtils.cs" /> <None Include="Helpers\OfficeInterop\OutlookUtils.cs" />
<Compile Include="Helpers\WindowWrapper.cs" /> <Compile Include="Helpers\WindowWrapper.cs" />
<Compile Include="Memento\AddElementMemento.cs" /> <Compile Include="Memento\AddElementMemento.cs" />

10
Greenshot/Greenshot.exe.config Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku="client"/>
<supportedRuntime version="v2.0.50727"/>
</startup>
<runtime>
<NetFx40_LegacySecurityPolicy enabled="true"/>
</runtime>
</configuration>

2
Greenshot/Helpers/EnvironmentInfo.cs
View file

@ -49,7 +49,7 @@ namespace Greenshot.Helpers {
} else { } else {
environment.Append(", "); environment.Append(", ");
} }
environment.Append(".NET runtime version: " + Assembly.GetEntryAssembly().ImageRuntimeVersion); environment.Append(".NET runtime version: " + Environment.Version);
if (newline) { if (newline) {
environment.AppendLine(); environment.AppendLine();
} else { } else {

1
Greenshot/releases/innosetup/setup.iss
View file

@ -15,6 +15,7 @@
[Files] [Files]
Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\GreenshotPlugin.dll; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\GreenshotPlugin.dll; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\Greenshot.exe.config; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\log4net.dll; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\log4net.dll; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\log4net.xml; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\log4net.xml; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\bin\Release\checksum.MD5; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion Source: ..\..\bin\Release\checksum.MD5; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion