diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-12 00:58:49 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-12 00:58:49 +0400 |
| commit | c851f0f573dafb3634dfd57a28585f97e58951e0 (patch) | |
| tree | 26466c7766904d00acd98090c810958b4320f416 /main/src/addins/MonoDevelop.Moonlight | |
| parent | ed0fafbce92ecd76e330d73995dec0eb9541a911 (diff) | |
* src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightBuildExtension.cs:
Include redist assemblies in manifest AssemblyParts. Should fix Bug
600727 - Moonlight: DataGrid missing.
svn path=/trunk/monodevelop/; revision=160208
Diffstat (limited to 'main/src/addins/MonoDevelop.Moonlight')
| -rw-r--r-- | main/src/addins/MonoDevelop.Moonlight/ChangeLog | 6 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightBuildExtension.cs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.Moonlight/ChangeLog b/main/src/addins/MonoDevelop.Moonlight/ChangeLog index d1d7b13fee..3c6b448f5c 100644 --- a/main/src/addins/MonoDevelop.Moonlight/ChangeLog +++ b/main/src/addins/MonoDevelop.Moonlight/ChangeLog @@ -1,3 +1,9 @@ +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. + 2010-07-06 Mike Krüger <mkrueger@novell.com> * MonoDevelop.Moonlight/MoonlightFrameworkBackend.cs: reverted diff --git a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightBuildExtension.cs b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightBuildExtension.cs index 4a1c193c58..9b1e049382 100644 --- a/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightBuildExtension.cs +++ b/main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight/MoonlightBuildExtension.cs @@ -404,7 +404,7 @@ namespace MonoDevelop.Moonlight foreach (ProjectReference pr in proj.References) { if (pr.LocalCopy) { var pk = pr.Package; - if (pk == null || !pk.IsFrameworkPackage) { + if (pk == null || !pk.IsFrameworkPackage || pk.Name.EndsWith ("-redist")) { foreach (string s in pr.GetReferencedFileNames (slnConf)) AddAssemblyPart (doc, partsNode, s); } @@ -512,7 +512,7 @@ namespace MonoDevelop.Moonlight foreach (ProjectReference pr in proj.References) { if (pr.LocalCopy) { var pk = pr.Package; - if (pk == null || (!pk.IsFrameworkPackage || pk.Name.EndsWith ("-redist"))) { + if (pk == null || !pk.IsFrameworkPackage || pk.Name.EndsWith ("-redist")) { string err = pr.ValidationErrorMessage; if (!String.IsNullOrEmpty (err)) { string msg = String.Format ("Could not add reference '{0}' to '{1}': {2}", |