← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MsNetFrameworkBackend.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/MsNetFrameworkBackend.cs
57
57
                        switch (framework.Id.Version) {
58
58
                        case "1.1":
59
59
                        case "2.0":
 
60
                                yield return targetRuntime.RootDirectory.Combine (GetClrVersion (framework.ClrVersion));
 
61
                                break;
60
62
                        case "4.0":
61
 
                                yield return targetRuntime.RootDirectory.Combine (GetClrVersion (framework.ClrVersion));
 
63
                                var fx40dir = targetRuntime.RootDirectory.Combine (GetClrVersion (framework.ClrVersion));
 
64
                                yield return fx40dir;
 
65
                                yield return fx40dir.Combine ("WPF");
62
66
                                break;
63
67
                        case "3.0":
64
68
                        case "3.5":
142
146
                        switch (v) {
143
147
                                case ClrVersion.Net_1_1: return "v1.1.4322";
144
148
                                case ClrVersion.Net_2_0: return "v2.0.50727";
 
149
                                case ClrVersion.Net_4_5: // The 4_5 binaries have the same version as the NET_4_0 binaries
145
150
                                case ClrVersion.Net_4_0: return "v4.0.30319";
146
151
                        }
147
152
                        return null;