← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric-updates

« back to all changes in this revision

Viewing changes to contrib/Mono.Cecil/Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2009-02-18 08:40:51 UTC
  • mfrom: (1.2.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090218084051-gh8m6ukvokbwj7cf
Tags: 1.9.2+dfsg-1ubuntu1
https://launchpad.net/bugs/330519
* Merge from Debian Experimental (LP: #330519), remaining Ubuntu changes:
  + debian/control:
    - Update for Gnome# 2.24
    - Add libmono-cairo1.0-cil to build-deps to fool pkg-config check

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/Mono.Cecil/Mono.Cecil/Mono.Cecil/BaseAssemblyResolver.cs
134
134
                        if (OnMono ()) {
135
135
                                if (reference.Version.Major == 1)
136
136
                                        path = Path.Combine (path, "1.0");
137
 
                                else if (reference.Version.Major == 2)
138
 
                                        path = Path.Combine (path, "2.0");
139
 
                                else
 
137
                                else if (reference.Version.Major == 2) {
 
138
                                        if (reference.Version.Minor == 1)
 
139
                                                path = Path.Combine (path, "2.1");
 
140
                                        else
 
141
                                                path = Path.Combine (path, "2.0");
 
142
                                } else
140
143
                                        throw new NotSupportedException ("Version not supported: " + reference.Version);
141
144
                        } else {
142
145
                                if (reference.Version.ToString () == "1.0.3300.0")