diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-12 01:03:29 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-12 01:03:29 +0400 |
| commit | db8ed12b9bd7e53c63aabeb3ed4f0d1f60c5663c (patch) | |
| tree | 678811db54ca96977d47e62e682d10e145c467ef /main/src/addins/MonoDevelop.Moonlight | |
| parent | c851f0f573dafb3634dfd57a28585f97e58951e0 (diff) | |
* src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspProjectDom.cs:
* src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs:
Workaround for gmcs bug.
svn path=/trunk/monodevelop/; revision=160209
Diffstat (limited to 'main/src/addins/MonoDevelop.Moonlight')
| -rw-r--r-- | main/src/addins/MonoDevelop.Moonlight/ChangeLog | 5 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.Moonlight/ChangeLog b/main/src/addins/MonoDevelop.Moonlight/ChangeLog index 3c6b448f5c..4ae16ecc76 100644 --- a/main/src/addins/MonoDevelop.Moonlight/ChangeLog +++ b/main/src/addins/MonoDevelop.Moonlight/ChangeLog @@ -1,5 +1,10 @@ 2010-07-11 Michael Hutchinson <mhutchinson@novell.com> + * MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: + Workaround for gmcs bug. + +2010-07-11 Michael Hutchinson <mhutchinson@novell.com> + * MonoDevelop.Moonlight/MoonlightBuildExtension.cs: Include redist assemblies in manifest AssemblyParts. Should fix Bug 600727 - Moonlight: DataGrid missing. diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs index 7c4e4c713b..07054bd70d 100644 --- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs +++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs @@ -126,10 +126,17 @@ namespace MonoDevelop.Moonlight { foreach (var f in GetFrameworkFolders ()) yield return f; - foreach (var f in base.GetToolsPaths ()) + foreach (var f in BaseGetToolsPaths ()) yield return f; } + //WORKAROUND for gmcs code generation bug - base not properly accessible from generators. + //Should be fixed in Mono 2.8 final. + IEnumerable<string> BaseGetToolsPaths () + { + return base.GetToolsPaths (); + } + Dictionary<string, string> envVars; public override Dictionary<string, string> GetToolsEnvironmentVariables () |