diff options
author | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-03-08 01:14:19 +0300 |
---|---|---|
committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-03-08 01:14:19 +0300 |
commit | a158155808d5dd2eb1a902496728dfd2dc2456aa (patch) | |
tree | f808bbdb220cc0202af984e605ee927583311dc9 /Core/src | |
parent | aca6a41a900f040c062c675ecea5af04fe063a0d (diff) |
Merged the following revisions from trunk:
asp.net editor fixes:
73390
73398
73403
73405
Other fixes:
73393
73394
73395
svn path=/branches/monodevelop/0.13/; revision=73916
Diffstat (limited to 'Core/src')
8 files changed, 24 insertions, 20 deletions
diff --git a/Core/src/MonoDevelop.Core.Gui/ChangeLog b/Core/src/MonoDevelop.Core.Gui/ChangeLog index df4be81cca..41aae7e1ca 100644 --- a/Core/src/MonoDevelop.Core.Gui/ChangeLog +++ b/Core/src/MonoDevelop.Core.Gui/ChangeLog @@ -1,3 +1,7 @@ +2007-02-24 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Core.Gui.addin.xml: Fix compatible version number. + 2007-02-16 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Core.Gui.addin.xml: Change add-in versions to 0.13. diff --git a/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml b/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml index 45299604a3..4fb079a1f3 100644 --- a/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml +++ b/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.addin.xml @@ -6,7 +6,7 @@ description = "Provides basic GUI services" category = "MonoDevelop Core" version = "0.13.0" - compatVersion = "0.10.0"> + compatVersion = "0.13.0"> <Runtime> <Import assembly="MonoDevelop.Components.dll"/> diff --git a/Core/src/MonoDevelop.Documentation/ChangeLog b/Core/src/MonoDevelop.Documentation/ChangeLog index 3586d11a22..4a259e241d 100644 --- a/Core/src/MonoDevelop.Documentation/ChangeLog +++ b/Core/src/MonoDevelop.Documentation/ChangeLog @@ -1,3 +1,7 @@ +2007-02-24 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Documentation.addin.xml: Fix compatible version number. + 2007-02-16 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Documentation.addin.xml: Change add-in versions to 0.13. diff --git a/Core/src/MonoDevelop.Documentation/MonoDevelop.Documentation.addin.xml b/Core/src/MonoDevelop.Documentation/MonoDevelop.Documentation.addin.xml index d65ea04192..848aaee257 100644 --- a/Core/src/MonoDevelop.Documentation/MonoDevelop.Documentation.addin.xml +++ b/Core/src/MonoDevelop.Documentation/MonoDevelop.Documentation.addin.xml @@ -6,7 +6,7 @@ description = "Integrates the Mono documentation browser (Monodoc) into the MonoDevelop IDE" category = "IDE extensions" version = "0.13.0" - compatVersion = "0.10.0"> + compatVersion = "0.13.0"> <Runtime> <Import assembly="MonoDevelop.Documentation.dll"/> diff --git a/Core/src/MonoDevelop.Ide/ChangeLog b/Core/src/MonoDevelop.Ide/ChangeLog index 648137c9bd..4048fc03b6 100644 --- a/Core/src/MonoDevelop.Ide/ChangeLog +++ b/Core/src/MonoDevelop.Ide/ChangeLog @@ -1,3 +1,7 @@ +2007-02-24 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Ide.addin.xml: Fix compatible version number. + 2007-02-21 Ankit Jain <jankit@novell.com> * MonoDevelop.Ide.Gui/ProjectOperations.cs (AddReferenceToProject): Ensure diff --git a/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml b/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml index 9014f420e7..17c3c2572d 100644 --- a/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml +++ b/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml @@ -6,7 +6,7 @@ description = "The MonoDevelop IDE application." category = "Applications" version = "0.13.0" - compatVersion = "0.10.0"> + compatVersion = "0.13.0"> <Runtime> diff --git a/Core/src/MonoDevelop.Projects/ChangeLog b/Core/src/MonoDevelop.Projects/ChangeLog index c022ac3d79..7ea388aad0 100644 --- a/Core/src/MonoDevelop.Projects/ChangeLog +++ b/Core/src/MonoDevelop.Projects/ChangeLog @@ -1,3 +1,11 @@ +2006-02-25 Michael Hutchinson <m.j.hutchinson@gmail.com> + + * Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs: + Remove OnPreBuild as it's no longer used or called. I was overriding + it and relying on it being called! + Make GetReferenceDeployFiles public so I don't have to duplicate it + for AspNetAddProject's GetDeployFiles. + 2007-02-21 Lluis Sanchez Gual <lluis@novell.com> * MonoDevelop.Projects/DotNetProjectConfiguration.cs: If the output diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs index ae1b89c0e3..d68566d78d 100644 --- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs +++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs @@ -228,7 +228,7 @@ namespace MonoDevelop.Projects } } - DeployFileCollection GetReferenceDeployFiles (bool force) + public DeployFileCollection GetReferenceDeployFiles (bool force) { DeployFileCollection deployFiles = new DeployFileCollection (); @@ -462,22 +462,6 @@ namespace MonoDevelop.Projects } } - protected virtual void DoPreBuild (IProgressMonitor monitor) - { - AbstractProjectConfiguration conf = ActiveConfiguration as AbstractProjectConfiguration; - - // create output directory, if not exists - string outputDir = conf.OutputDirectory; - try { - DirectoryInfo directoryInfo = new DirectoryInfo(outputDir); - if (!directoryInfo.Exists) { - directoryInfo.Create(); - } - } catch (Exception e) { - throw new ApplicationException("Can't create project output directory " + outputDir + " original exception:\n" + e.ToString()); - } - } - protected virtual ICompilerResult DoBuild (IProgressMonitor monitor) { return new DefaultCompilerResult (new CompilerResults (null), ""); |