diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2014-03-12 12:47:14 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2014-03-12 12:47:14 +0400 |
| commit | e69642cbe076d0ce343b2acfb149bd2f3b9856d3 (patch) | |
| tree | 5e359380ec8aa092b3c6b93bd0337bb3b834afbe /main/src/core/MonoDevelop.Core | |
| parent | 9d20568ee73880bfff7a69b86b0e97ed09d166d1 (diff) | |
| parent | e85ba34d625352a886cce76f2301481b6ffcc272 (diff) | |
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Core')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs index 00af6845a0..a03241af68 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs @@ -195,7 +195,14 @@ namespace MonoDevelop.Core.Assemblies TargetFramework fx; if (frameworks.TryGetValue (id, out fx)) return fx; - LoggingService.LogWarning ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService", id); + + LoggingService.LogDebug ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService, ensuring rutimes initialized and trying again", id); + foreach (var r in runtimes) + r.EnsureInitialized (); + if (frameworks.TryGetValue (id, out fx)) + return fx; + + LoggingService.LogWarning ("Unregistered TargetFramework '{0}' is being requested from SystemAssemblyService, returning empty TargetFramework", id); UpdateFrameworks (new [] { new TargetFramework (id) }); return frameworks [id]; } |