← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetToolboxLoader.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetToolboxLoader.cs
33
33
 
34
34
using MonoDevelop.DesignerSupport.Toolbox;
35
35
using MonoDevelop.Core.Assemblies;
 
36
using MonoDevelop.Core;
36
37
 
37
38
 
38
39
namespace MonoDevelop.AspNet
191
192
                        inited = true;
192
193
                        
193
194
                        //System.Reflection.Assembly.Load won't load things from the 1.0 GAC
194
 
                        TargetFramework fx = MonoDevelop.Core.Runtime.SystemAssemblyService.GetTargetFramework ("1.1");
195
 
                        string loc = MonoDevelop.Core.Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation ( 
 
195
                        TargetFramework fx = Runtime.SystemAssemblyService.GetTargetFramework (TargetFrameworkMoniker.NET_1_1);
 
196
                        string loc = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyLocation ( 
196
197
                            "System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", fx);
197
198
                        if (loc != null)
198
199
                                webAssem1 = System.Reflection.Assembly.LoadFile (loc);