Merge pull request #487 from mayerwin/patch-1

[mono.git] / mcs / class / System / Microsoft.CSharp / CSharpCodeCompiler.cs

diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
index 1883afe7ed93218122f6af01e3eadf2cf4017c72..26039bdd79b3de87fccd138b2345b4f809967f16 100644 (file)
--- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
@@ -281,7 +281,7 @@ namespace Mono.CSharp
                                        using (FileStream fs = File.OpenRead(options.OutputAssembly)) {
                                                byte[] buffer = new byte[fs.Length];
                                                fs.Read(buffer, 0, buffer.Length);
-                                               results.CompiledAssembly = Assembly.Load(buffer, null, options.Evidence);
+                                               results.CompiledAssembly = Assembly.Load(buffer, null);
                                                fs.Close();
                                        }
                                } else {
@@ -381,8 +381,10 @@ namespace Mono.CSharp
                                                break;
                                }
                        }
-                       
-#if NET_4_0
+
+#if NET_4_5                    
+                       args.Append("/sdk:4.5");
+#elif NET_4_0
                        args.Append("/sdk:4");
 #else
                        args.Append("/sdk:2");