diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-06-30 09:29:46 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-06-30 09:29:46 +0400 |
commit | b2b2aa807b2f81a2ed03daad3ac3e3a4323c2a1b (patch) | |
tree | 629d2efed9db1312ebc07382eb86d7f050fc3088 /main/src/addins/AspNet | |
parent | fb698dce56a826719ebb61090201b2314c3c230c (diff) | |
parent | 0f098c1660a63bde65945d43008245e317ea0ec5 (diff) |
Merge branch 'master' into newresolver
Conflicts:
main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.cs
main/src/addins/CSharpBinding/CSharpBinding.addin.xml
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DomTypeProxy.cs
main/src/core/MonoDevelop.Ide/Makefile.am
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/src/addins/AspNet')
12 files changed, 24 insertions, 22 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs index c025554519..4b9c3aa997 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs @@ -110,7 +110,7 @@ namespace MonoDevelop.AspNet.Mvc //HACK: workaround for MD not local-copying package references foreach (ProjectReference projectReference in References) { if (projectReference.Package != null && projectReference.Package.Name == "system.web.mvc") { - if (projectReference.LocalCopy && projectReference.ReferenceType == ReferenceType.Gac) + if (projectReference.ReferenceType == ReferenceType.Gac) foreach (MonoDevelop.Core.Assemblies.SystemAssembly assem in projectReference.Package.Assemblies) list.Add (assem.Location); break; diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/MonoDevelop.AspNet.Mvc.Gui.AddViewDialog.cs b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/MonoDevelop.AspNet.Mvc.Gui.AddViewDialog.cs index a7a3e158cf..706c1dde99 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/MonoDevelop.AspNet.Mvc.Gui.AddViewDialog.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/MonoDevelop.AspNet.Mvc.Gui.AddViewDialog.cs @@ -32,7 +32,7 @@ namespace MonoDevelop.AspNet.Mvc.Gui private global::Gtk.Label GtkLabel6; private global::Gtk.Button buttonCancel; private global::Gtk.Button buttonOk; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/generated.cs b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/generated.cs index 9ef3363981..9636f6fc5d 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/generated.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/gtk-gui/generated.cs @@ -5,7 +5,7 @@ namespace Stetic internal class Gui { private static bool initialized; - + internal static void Initialize (Gtk.Widget iconRenderer) { if ((Stetic.Gui.initialized == false)) { @@ -13,14 +13,14 @@ namespace Stetic } } } - + internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) { return Stetic.ActionGroups.GetActionGroup (type.FullName); } - + public static Gtk.ActionGroup GetActionGroup (string name) { return null; diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj index 9de7d3e9cf..c94936b6c1 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.csproj @@ -325,6 +325,7 @@ <ProjectExtensions> <MonoDevelop> <Properties> + <GtkDesignInfo gettextClass="MonoDevelop.Core.GettextCatalog" /> <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath="../../../.."> <BuildFilesVar Sync="true" Name="FILES" /> <DeployFilesVar Sync="true" Name="DATA_FILES" /> diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs index b4fcf8578b..8e0209a03d 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/VerifyCodeBehindBuildStep.cs @@ -123,7 +123,7 @@ namespace MonoDevelop.AspNet if (ccu == null) continue; - writer.Write (ccu, designerFile.FilePath); + writer.WriteFile (designerFile.FilePath, ccu); } writer.WriteOpenFiles (); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs index 85860b4617..5be3bb9272 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployLaunchDialog.cs @@ -11,7 +11,7 @@ namespace MonoDevelop.AspNet.Deployment private global::Gtk.Button button6; private global::Gtk.Button buttonCancel; private global::Gtk.Button buttonDeploy; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs index 61033baa13..b41acad291 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployOptionsPanelWidget.cs @@ -11,7 +11,7 @@ namespace MonoDevelop.AspNet.Deployment private global::Gtk.Button addButton; private global::Gtk.Button editButton; private global::Gtk.Button removeButton; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs index e4bbde386b..682e83bfa5 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Deployment.WebDeployTargetEditor.cs @@ -18,7 +18,7 @@ namespace MonoDevelop.AspNet.Deployment private global::Gtk.HBox fileCopyBox; private global::Gtk.Button buttonCancel; private global::Gtk.Button buttonOk; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs index 1d4b67b1c5..2a34685d57 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.AspNetConfigurationPanelWidget.cs @@ -10,7 +10,7 @@ namespace MonoDevelop.AspNet.Gui private global::Gtk.Label label2; private global::Gtk.VBox vbox2; private global::Gtk.CheckButton disableCodeBehindGeneration; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs index 66d3a2a86b..b9c5d2596e 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/MonoDevelop.AspNet.Gui.XspOptionsPanelWidget.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.AspNet.Gui private global::Gtk.Label label12; private global::Gtk.Label label13; private global::Gtk.Label label14; - + protected virtual void Build () { global::Stetic.Gui.Initialize (this); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/generated.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/generated.cs index 0ada9fc5f0..d23ef38e01 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/generated.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/generated.cs @@ -5,7 +5,7 @@ namespace Stetic internal class Gui { private static bool initialized; - + internal static void Initialize (Gtk.Widget iconRenderer) { if ((Stetic.Gui.initialized == false)) { @@ -13,12 +13,12 @@ namespace Stetic } } } - + internal class BinContainer { private Gtk.Widget child; private Gtk.UIManager uimanager; - + public static BinContainer Attach (Gtk.Bin bin) { BinContainer bc = new BinContainer (); @@ -27,32 +27,32 @@ namespace Stetic bin.Added += new Gtk.AddedHandler (bc.OnAdded); return bc; } - + private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) { if ((this.child != null)) { args.Requisition = this.child.SizeRequest (); } } - + private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) { if ((this.child != null)) { this.child.Allocation = args.Allocation; } } - + private void OnAdded (object sender, Gtk.AddedArgs args) { this.child = args.Widget; } - + public void SetUiManager (Gtk.UIManager uim) { this.uimanager = uim; this.child.Realized += new System.EventHandler (this.OnRealized); } - + private void OnRealized (object sender, System.EventArgs args) { if ((this.uimanager != null)) { @@ -65,7 +65,7 @@ namespace Stetic } } } - + internal class IconLoader { public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) @@ -99,14 +99,14 @@ namespace Stetic } } } - + internal class ActionGroups { public static Gtk.ActionGroup GetActionGroup (System.Type type) { return Stetic.ActionGroups.GetActionGroup (type.FullName); } - + public static Gtk.ActionGroup GetActionGroup (string name) { return null; diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/gui.stetic b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/gui.stetic index 531bfdfb9b..e5395a2fe6 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/gui.stetic +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/gtk-gui/gui.stetic @@ -7,6 +7,7 @@ <import> <widget-library name="../../../../../build/bin/MonoDevelop.Ide.dll" /> <widget-library name="../../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" /> + <widget-library name="../../../../../build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll" /> <widget-library name="../../../../../build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll" /> <widget-library name="../../../../../build/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll" /> <widget-library name="../../../../../build/bin/Mono.TextEditor.dll" /> |