From 4a07359cf671b0560a6281cbd0d8b6fb7095ab72 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Tue, 21 Feb 2012 09:16:16 +0000
Subject: [PATCH] Added a Greenshot.exe.config to allow running under .NET 4.0
 and later.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1672 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 Greenshot/Greenshot.csproj             |  3 +++
 Greenshot/Greenshot.exe.config         | 10 ++++++++++
 Greenshot/Helpers/EnvironmentInfo.cs   |  2 +-
 Greenshot/releases/innosetup/setup.iss |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 Greenshot/Greenshot.exe.config

diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index 325d42ba0..c2d34f6f1 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -194,6 +194,9 @@
     <Compile Include="Helpers\OfficeInterop\ExcelWrapper.cs" />
     <Compile Include="Helpers\ProcessorHelper.cs" />
     <Compile Include="Processors\TitleFixProcessor.cs" />
+    <None Include="Greenshot.exe.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Helpers\OfficeInterop\OutlookUtils.cs" />
     <Compile Include="Helpers\WindowWrapper.cs" />
     <Compile Include="Memento\AddElementMemento.cs" />
diff --git a/Greenshot/Greenshot.exe.config b/Greenshot/Greenshot.exe.config
new file mode 100644
index 000000000..2a520fa93
--- /dev/null
+++ b/Greenshot/Greenshot.exe.config
@@ -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>
\ No newline at end of file
diff --git a/Greenshot/Helpers/EnvironmentInfo.cs b/Greenshot/Helpers/EnvironmentInfo.cs
index 5529d0e01..a217b9c6b 100644
--- a/Greenshot/Helpers/EnvironmentInfo.cs
+++ b/Greenshot/Helpers/EnvironmentInfo.cs
@@ -49,7 +49,7 @@ namespace Greenshot.Helpers {
 			} else {
 				environment.Append(", ");
 			}
-			environment.Append(".NET runtime version: " + Assembly.GetEntryAssembly().ImageRuntimeVersion);
+			environment.Append(".NET runtime version: " + Environment.Version);
 			if (newline) {
 				environment.AppendLine();
 			} else {
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 8c4852adf..1be574970 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -15,6 +15,7 @@
 [Files]
 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\Greenshot.exe.config; 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\checksum.MD5; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion