mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.48

Browse Source 
Former-commit-id: 820b1abb8b0084602f3170cd587a99c905e1dae5
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-11 11:25:27 +00:00
parent 6bdd276d05
commit 5005e1465f
2770 changed files with 311123 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mcs/mcs/ikvm.cs
View File

@@ -249,7 +249,12 @@ namespace Mono.CSharp
sdk_directory.Add ("4", new string[] { "4.0-api", "v4.0.30319" });
sdk_directory.Add ("4.0", new string[] { "4.0-api", "v4.0.30319" });
sdk_directory.Add ("4.5", new string[] { "4.5-api", "v4.0.30319" });
sdk_directory.Add ("4.6", new string [] { "4.5", "net_4_x", "v4.0.30319" });
sdk_directory.Add ("4.5.1", new string[] { "4.5.1-api", "v4.0.30319" });
sdk_directory.Add ("4.5.2", new string[] { "4.5.2-api", "v4.0.30319" });
sdk_directory.Add ("4.6", new string[] { "4.6-api", "v4.0.30319" });
sdk_directory.Add ("4.6.1", new string[] { "4.6.1-api", "v4.0.30319" });
sdk_directory.Add ("4.6.2", new string [] { "4.6.2-api", "v4.0.30319" });
sdk_directory.Add ("4.x", new string [] { "4.5", "net_4_x", "v4.0.30319" });
}
public StaticLoader (StaticImporter importer, CompilerContext compiler)
@@ -269,7 +274,7 @@ namespace Mono.CSharp
string sdk_path = null;
string sdk_version = compiler.Settings.SdkVersion ?? "4.6";
string sdk_version = compiler.Settings.SdkVersion ?? "4.x";
string[] sdk_sub_dirs;
if (!sdk_directory.TryGetValue (sdk_version, out sdk_sub_dirs))