← Back to branch summary

~ubuntu-branches/ubuntu/natty/monodevelop/natty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-01-07 19:06:58 UTC
  • mto: (1.6.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 46.
  • Revision ID: james.westby@ubuntu.com-20100107190658-z9z95lgk4kwfes7p
Import upstream version 2.2+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
71
71
                        runtimes = new List<TargetRuntime> ();
72
72
                        foreach (ITargetRuntimeFactory factory in AddinManager.GetExtensionObjects ("/MonoDevelop/Core/Runtimes", typeof(ITargetRuntimeFactory))) {
73
73
                                foreach (TargetRuntime runtime in factory.CreateRuntimes ()) {
74
 
                                        RegisterRuntime (runtime);
 
74
                                        runtimes.Add (runtime);
75
75
                                        if (runtime.IsRunning)
76
76
                                                DefaultRuntime = CurrentRuntime = runtime;
77
77
                                }
78
78
                        }
 
79
                        
 
80
                        // Don't initialize until Current and Default Runtimes are set
 
81
                        foreach (TargetRuntime runtime in runtimes)
 
82
                                runtime.StartInitialization ();
 
83
                        
79
84
                        if (CurrentRuntime == null)
80
85
                                LoggingService.LogFatalError ("Could not create runtime info for current runtime");
81
86
                        
154
159
                        foreach (TargetFramework fx in frameworks)
155
160
                                if (fx.Id == id)
156
161
                                        return fx;
 
162
                        LoggingService.LogWarning ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService", id);
157
163
                        TargetFramework f = new TargetFramework (id);
158
164
                        frameworks.Add (f);
159
165
                        return f;