← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.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/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.cs
84
84
                        file = runtime.AssemblyContext.GetAssemblyLocation (file, targetFramework);
85
85
                        if (string.IsNullOrEmpty (file))
86
86
                                throw new Exception ("System.Web assembly file not found for framework " + targetFramework.Id);
87
 
                        var dom = new SimpleCompilation (TypeSystemService.LoadAssemblyContext (runtime, targetFramework, file));
 
87
                        var dom = new SimpleCompilation (TypeSystemService.LoadAssemblyContext (runtime, targetFramework, file), new IAssemblyReference[] {
 
88
                                TypeSystemService.LoadAssemblyContext (runtime, targetFramework, typeof (object).Assembly.Location)
 
89
                        });
88
90
                        if (dom == null)
89
91
                                throw new Exception ("System.Web parse database not found for framework " + targetFramework.Id + " file '" + file + "'");
90
92
                        return dom;
295
297
                {
296
298
                        var str = HtmlControlLookup (tagName, typeAttribute);
297
299
                        if (str != null) {
298
 
                                return SystemWebDom.LookupType (str);
 
300
                                return ReflectionHelper.ParseReflectionName (str).Resolve (SystemWebDom);
299
301
                        }
300
302
                        return null;
301
303
                }