| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<0000014257a403c7-03fdbbe8-7bd0-41bd-bfc7-fe5d08032499-000000@email.amazonses.com> |
Branch: refs/heads/retina
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/a534165a6455...c68ffa40c117
Commit: c46d8e31bb87c8f28ea2cbabab86ccc312dc39bb
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-01 17:27:19 GMT
URL: https://github.com/mono/monodevelop/commit/c46d8e31bb87c8f28ea2cbabab86ccc312dc39bb
[MacInterop] code cleanup
Changed paths:
M main/src/addins/MacPlatform/MacInterop/Keychain.cs
Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -249,19 +249,20 @@ static string CFStringGetString (IntPtr handle)
if (handle == IntPtr.Zero)
return null;
- string str;
-
- int l = CFStringGetLength (handle);
- IntPtr u = CFStringGetCharactersPtr (handle);
+ int length = CFStringGetLength (handle);
+ var unicode = CFStringGetCharactersPtr (handle);
IntPtr buffer = IntPtr.Zero;
- if (u == IntPtr.Zero){
- CFRange r = new CFRange (0, l);
- buffer = Marshal.AllocCoTaskMem (l * 2);
- CFStringGetCharacters (handle, r, buffer);
- u = buffer;
+ string str;
+
+ if (unicode == IntPtr.Zero){
+ var range = new CFRange (0, length);
+ buffer = Marshal.AllocCoTaskMem (length * 2);
+ CFStringGetCharacters (handle, range, buffer);
+ unicode = buffer;
}
+
unsafe {
- str = new string ((char *) u, 0, l);
+ str = new string ((char *) unicode, 0, length);
}
if (buffer != IntPtr.Zero)
@@ -272,34 +273,6 @@ static string CFStringGetString (IntPtr handle)
#endregion
- #region CFMutableDictionary
-
-// struct CFDictionaryKeyCallBacks {
-// CFIndex version;
-// CFDictionaryRetainCallBack retain;
-// CFDictionaryReleaseCallBack release;
-// CFDictionaryCopyDescriptionCallBack copyDescription;
-// CFDictionaryEqualCallBack equal;
-// CFDictionaryHashCallBack hash;
-// };
-//
-// struct CFDictionaryValueCallBacks {
-// CFIndex version;
-// CFDictionaryRetainCallBack retain;
-// CFDictionaryReleaseCallBack release;
-// CFDictionaryCopyDescriptionCallBack copyDescription;
-// CFDictionaryEqualCallBack equal;
-// };
-
- // use kCFTypeDictionaryKeyCallBacks and kCFTypeDictionaryValueCallBacks
-
- // CFDictionaryRef CFDictionaryCreate (CFAllocatorRef allocator, const void **keys, const void **values, CFIndex numValues, const CFDictionaryKeyCallBacks *keyCallBacks, const CFDictionaryValueCallBacks *valueCallBacks);
- // CFMutableDictionaryRef CFDictionaryCreateMutable (CFAllocatorRef allocator, CFIndex capacity, const CFDictionaryKeyCallBacks *keyCallBacks, const CFDictionaryValueCallBacks *valueCallBacks);
-
- // void CFDictionaryAddValue (CFMutableDictionaryRef theDict, const void *key, const void *value);
-
- #endregion
-
static string GetError (OSStatus status)
{
IntPtr str = IntPtr.Zero;
Commit: 07b3ba554ed5f01e3c8da0b26dccd6d883d642dd
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-01 17:29:47 GMT
URL: https://github.com/mono/monodevelop/commit/07b3ba554ed5f01e3c8da0b26dccd6d883d642dd
bumped version-checks for various fixes
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=05f9100469dd7b229cb23ba335a8bfaa5199a28f
+DEP_NEEDED_VERSION[0]=bc719efa0e02d1bdefcad9a2225a86e307a57db7
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: a6a718e8ee3f94ddd40b8b30941b97e233f99289
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-11-02 11:21:51 GMT
URL: https://github.com/mono/monodevelop/commit/a6a718e8ee3f94ddd40b8b30941b97e233f99289
Cleanup ChangeLogAddIn
Changed paths:
M main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
M main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
M main/src/addins/ChangeLogAddIn/ChangeLogService.cs
M main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
M main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
Modified: main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
===================================================================
@@ -33,12 +33,12 @@
namespace MonoDevelop.ChangeLogAddIn
{
- internal partial class AddLogEntryDialog : Gtk.Dialog
+ partial class AddLogEntryDialog : Dialog
{
- ListStore store;
- Dictionary<ChangeLogEntry,string> changes = new Dictionary<ChangeLogEntry,string> ();
- TextMark editMark;
- TextTag oldTextTag;
+ readonly ListStore store;
+ readonly Dictionary<ChangeLogEntry, string> changes = new Dictionary<ChangeLogEntry, string> ();
+ readonly TextMark editMark;
+ readonly TextTag oldTextTag;
bool loading;
public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
@@ -52,8 +52,8 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
Pango.TabArray tabs = new Pango.TabArray (1, true);
tabs.SetTab (0, Pango.TabAlign.Left, GetStringWidth (" ") * 4);
textview.Tabs = tabs;
- textview.SizeRequested += delegate (object o, SizeRequestedArgs args) {
- textview.WidthRequest = GetStringWidth (string.Empty.PadRight (80));
+ textview.SizeRequested += delegate {
+ textview.WidthRequest = GetStringWidth (String.Empty.PadRight (80));
};
font.Dispose ();
@@ -66,9 +66,9 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
foreach (ChangeLogEntry ce in entries.Values) {
Gdk.Pixbuf pic;
if (ce.CantGenerate)
- pic = ImageService.GetPixbuf (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.DialogWarning, IconSize.Menu);
else if (ce.IsNew)
- pic = ImageService.GetPixbuf (Gtk.Stock.New, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.New, IconSize.Menu);
else
pic = null;
store.AppendValues (ce, pic, ce.File);
@@ -78,7 +78,7 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
TreeIter it;
editMark = textview.Buffer.CreateMark (null, textview.Buffer.EndIter, false);
- oldTextTag = new Gtk.TextTag ("readonly");
+ oldTextTag = new TextTag ("readonly");
oldTextTag.Foreground = "gray";
oldTextTag.Editable = false;
textview.Buffer.TagTable.Add (oldTextTag);
@@ -87,10 +87,10 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
fileList.Selection.SelectIter (it);
}
- private int GetStringWidth (string str)
+ int GetStringWidth (string str)
{
int width, height;
- Pango.Layout layout = new Pango.Layout (textview.PangoContext);
+ var layout = new Pango.Layout (textview.PangoContext);
layout.SetText (str);
layout.GetPixelSize (out width, out height);
layout.Dispose ();
@@ -105,7 +105,7 @@ public void OnSelectionChanged (object s, EventArgs a)
textview.Sensitive = false;
} else {
textview.Sensitive = true;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
boxNewFile.Visible = ce.IsNew && !ce.CantGenerate;
boxNoFile.Visible = ce.CantGenerate;
loading = true;
@@ -132,7 +132,7 @@ public void OnTextChanged (object s, EventArgs a)
TreeIter it;
if (!fileList.Selection.GetSelected (out it))
return;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
changes [ce] = textview.Buffer.GetText (textview.Buffer.StartIter, textview.Buffer.GetIterAtMark (editMark), true);
}
Modified: main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
===================================================================
@@ -64,23 +64,21 @@ protected override void Update(CommandInfo info)
info.Enabled = false;
}
- private string GetSelectedFile()
+ static string GetSelectedFile()
{
if (IdeApp.Workbench.ActiveDocument != null) {
string fn = IdeApp.Workbench.ActiveDocument.FileName;
if (fn != null && Path.GetFileName (fn) != "ChangeLog")
return fn;
}
- ProjectFile file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
+ var file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
if (file != null)
return file.FilePath;
- SystemFile sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
- if (sf != null)
- return sf.Path;
- return null;
+ var sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
+ return sf != null ? sf.Path : null;
}
- private void InsertEntry(Document document)
+ static void InsertEntry(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return;
@@ -92,7 +90,7 @@ private void InsertEntry(Document document)
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
int pos = GetHeaderEndPosition (document);
- if (pos > 0 && selectedFileNameDirectory.StartsWith(changeLogFileNameDirectory)) {
+ if (pos > 0 && selectedFileNameDirectory.StartsWith (changeLogFileNameDirectory, StringComparison.Ordinal)) {
string text = "\t* "
+ selectedFileName.Substring(changeLogFileNameDirectory.Length + 1) + ": "
+ eol + eol;
@@ -107,7 +105,7 @@ private void InsertEntry(Document document)
}
}
- private bool InsertHeader (Document document)
+ static bool InsertHeader (Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return false;
@@ -133,7 +131,7 @@ private bool InsertHeader (Document document)
return true;
}
- private int GetHeaderEndPosition(Document document)
+ static int GetHeaderEndPosition(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return 0;
@@ -143,10 +141,10 @@ private int GetHeaderEndPosition(Document document)
string text = textBuffer.GetText (0, Math.Min (textBuffer.Length, 1023));
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
- return text.IndexOf (eol + eol);
+ return text.IndexOf (eol + eol, StringComparison.Ordinal);
}
- private Document GetActiveChangeLogDocument()
+ static Document GetActiveChangeLogDocument()
{
string file = GetSelectedFile ();
if (file == null)
Modified: main/src/addins/ChangeLogAddIn/ChangeLogService.cs
===================================================================
@@ -115,11 +115,7 @@ public static string GetChangeLogForFile (string baseCommitPath, string file)
public static CommitMessageStyle GetMessageStyle (SolutionItem item)
{
- ChangeLogPolicy policy;
- if (item != null)
- policy = GetPolicy (item);
- else
- policy = new ChangeLogPolicy ();
+ ChangeLogPolicy policy = item != null ? GetPolicy (item) : new ChangeLogPolicy ();
return policy.MessageStyle;
}
Modified: main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
===================================================================
@@ -32,7 +32,6 @@
using MonoDevelop.VersionControl;
using MonoDevelop.Core;
using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide;
using MonoDevelop.Projects;
@@ -40,10 +39,10 @@ namespace MonoDevelop.ChangeLogAddIn
{
public class CommitDialogExtensionWidget: CommitDialogExtension
{
- HBox box = new HBox ();
- VBox vbox = new VBox ();
- Button logButton;
- Button optionsButton;
+ readonly HBox box = new HBox ();
+ readonly VBox vbox = new VBox ();
+ readonly Button logButton;
+ readonly Button optionsButton;
ChangeSet cset;
Label msgLabel;
Label pathLabel;
@@ -65,18 +64,18 @@ public CommitDialogExtensionWidget()
optionsButton = new Button (GettextCatalog.GetString ("Options..."));
optionsButton.Clicked += OnClickOptions;
- VBox aux = new VBox ();
+ var aux = new VBox ();
box.PackStart (aux, false, false, 3);
- HBox haux = new HBox ();
+ var haux = new HBox ();
haux.Spacing = 6;
aux.PackStart (haux, false, false, 0);
haux.PackStart (logButton, false, false, 0);
haux.PackStart (optionsButton, false, false, 0);
}
- public override bool Initialize (ChangeSet cset)
+ public override bool Initialize (ChangeSet changeSet)
{
- this.cset = cset;
+ cset = changeSet;
msgLabel = new Label ();
pathLabel = new Label ();
msgLabel.Xalign = 0;
@@ -227,7 +226,7 @@ void GenerateLogEntries ()
requireComment = false;
foreach (ChangeSetItem item in cset.Items) {
- MonoDevelop.Projects.SolutionItem parentItem;
+ SolutionItem parentItem;
ChangeLogPolicy policy;
string logf = ChangeLogService.GetChangeLogForFile (cset.BaseLocalPath, item.LocalPath,
out parentItem, out policy);
@@ -246,8 +245,7 @@ void GenerateLogEntries ()
if (string.IsNullOrEmpty (item.Comment) && !item.IsDirectory) {
uncommentedCount++;
- if (policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry)
- requireComment = true;
+ requireComment |= policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry;
}
ChangeLogEntry entry;
@@ -260,15 +258,14 @@ void GenerateLogEntries ()
if (cantGenerate)
unknownFileCount++;
- if (!File.Exists (logf))
- entry.IsNew = true;
+ entry.IsNew |= !File.Exists (logf);
entries [logf] = entry;
}
entry.Items.Add (item);
}
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.TabsAsSpaces = false;
format.TabWidth = 8;
format.MaxColumns = 70;
@@ -283,19 +280,19 @@ void GenerateLogEntries ()
void OnClickButton (object s, EventArgs args)
{
if (notConfigured) {
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
return;
}
var dlg = new AddLogEntryDialog (entries);
- MessageService.ShowCustomDialog (dlg, (Gtk.Window) Toplevel);
+ MessageService.ShowCustomDialog (dlg, (Window) Toplevel);
}
void OnClickOptions (object s, EventArgs args)
{
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
}
Modified: main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.ChangeLogAddIn
class OldChangeLogData
{
[ItemProperty]
- ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
+ readonly ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
OldChangeLogData ()
{
@@ -55,7 +55,7 @@ public static void Migrate (SolutionItem entry)
if (entry.ParentFolder != null)
Migrate (entry.ParentFolder);
- OldChangeLogData data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
+ var data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
if (data == null)
return;
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
===================================================================
@@ -43,11 +43,14 @@ public override Widget CreatePanelWidget ()
public override void Initialize (OptionsDialog dialog, object dataObject)
{
- if (dataObject is SolutionItem)
- OldChangeLogData.Migrate ((SolutionItem)dataObject);
- else if (dataObject is Solution)
- OldChangeLogData.Migrate (((Solution)dataObject).RootFolder);
-
+ var solutionItem = dataObject as SolutionItem;
+ if (solutionItem != null)
+ OldChangeLogData.Migrate (solutionItem);
+ else {
+ var solution = dataObject as Solution;
+ if (solution != null)
+ OldChangeLogData.Migrate (solution.RootFolder);
+ }
base.Initialize (dialog, dataObject);
}
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
===================================================================
@@ -25,16 +25,14 @@
//
//
-using System;
using MonoDevelop.Projects;
using MonoDevelop.VersionControl;
-using MonoDevelop.Ide;
namespace MonoDevelop.ChangeLogAddIn
{
partial class ProjectOptionPanelWidget : Gtk.Bin
{
- ProjectOptionPanel parent;
+ readonly ProjectOptionPanel parent;
CommitMessageStyle style;
public ProjectOptionPanelWidget (ProjectOptionPanel parent)
@@ -60,13 +58,13 @@ public void LoadFrom (ChangeLogPolicy policy)
break;
}
- this.checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
- this.checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
+ checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
+ checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
style = new CommitMessageStyle ();
style.CopyFrom (policy.MessageStyle);
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.MaxColumns = 70;
format.Style = style;
Commit: a0c7290772e5c3943025cabc650eec7800a3af85
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 12:24:10 GMT
URL: https://github.com/mono/monodevelop/commit/a0c7290772e5c3943025cabc650eec7800a3af85
[Branding] Brand user-visible strings.
Changed paths:
M main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/AddinSetupService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/BuildTool.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
M main/src/tools/mdtool/src/mdtool.cs
Modified: main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
===================================================================
@@ -42,7 +42,7 @@ class GettextTool: IApplication
public int Run (string[] arguments)
{
- Console.WriteLine ("MonoDevelop Gettext Update Tool");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Gettext Update Tool"));
foreach (string s in arguments)
ReadArgument (s);
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/AddinSetupService.cs
===================================================================
@@ -47,7 +47,7 @@ public void RegisterMainRepository (UpdateLevel level, bool enable)
string url = GetMainRepositoryUrl (level);
if (!Repositories.ContainsRepository (url)) {
var rep = Repositories.RegisterRepository (null, url, false);
- rep.Name = "MonoDevelop Add-in Repository";
+ rep.Name = BrandingService.BrandApplicationName ("MonoDevelop Add-in Repository");
if (level != UpdateLevel.Stable)
rep.Name += " (" + level + " channel)";
if (!enable)
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/BuildTool.cs
===================================================================
@@ -48,7 +48,7 @@ internal class BuildTool : IApplication
public int Run (string[] arguments)
{
- Console.WriteLine ("MonoDevelop Build Tool");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Build Tool"));
foreach (string s in arguments)
ReadArgument (s);
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs
===================================================================
@@ -63,7 +63,7 @@ public override void RequestFileEdit (IEnumerable<FilePath> files)
return;
var btn = new AlertButton (GettextCatalog.GetString ("Make Writable"));
- var res = MessageService.AskQuestion (error, GettextCatalog.GetString ("Would you like MonoDevelop to attempt to make the file writable and try again?"), btn, AlertButton.Cancel);
+ var res = MessageService.AskQuestion (error, GettextCatalog.GetString ("Would you like {0} to attempt to make the file writable and try again?", BrandingService.ApplicationName), btn, AlertButton.Cancel);
if (res == AlertButton.Cancel)
throw new UserException (error) { AlreadyReportedToUser = true };
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
===================================================================
@@ -97,7 +97,7 @@ public static void SendFeedback (string email, string body)
PropertyService.Set ("MonoDevelop.Feedback.Email", email);
PropertyService.SaveProperties ();
- string header = "MonoDevelop: " + BuildInfo.VersionLabel + "\n";
+ string header = BrandingService.BrandApplicationName ("MonoDevelop: ") + BuildInfo.VersionLabel + "\n";
Type t = Type.GetType ("Mono.Runtime");
if (t != null) {
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
===================================================================
@@ -455,7 +455,7 @@ static void ValidateGtkTheme (ref string theme)
"set it as your default in the GTK+ Theme Selector or MonoDevelop Preferences.";
}
- MessageService.GenericAlert (Gtk.Stock.DialogWarning, message, detail, AlertButton.Ok);
+ MessageService.GenericAlert (Gtk.Stock.DialogWarning, message, BrandingService.BrandApplicationName (detail), AlertButton.Ok);
theme = fallback ?? themes.FirstOrDefault () ?? theme;
}
Modified: main/src/tools/mdtool/src/mdtool.cs
===================================================================
@@ -154,7 +154,7 @@ static void ShowHelp (bool shortHelp)
return;
}
Console.WriteLine ();
- Console.WriteLine ("MonoDevelop Tool Runner");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Tool Runner"));
Console.WriteLine ();
Console.WriteLine ("Usage: mdtool [options] <tool> ... : Runs a tool.");
Console.WriteLine (" mdtool setup ... : Runs the setup utility.");
@@ -169,7 +169,7 @@ static void ShowHelp (bool shortHelp)
static int RunSetup (string[] args)
{
- Console.WriteLine ("MonoDevelop Add-in Setup Utility");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Add-in Setup Utility"));
bool verbose = false;
foreach (string a in args)
if (a == "-v")
Commit: 2e9a17e32533e9795673ed065c73b39a508324c0
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-11-04 15:46:07 GMT
URL: https://github.com/mono/monodevelop/commit/2e9a17e32533e9795673ed065c73b39a508324c0
Merge pull request #427 from mono/cleanupChangelog
Cleanup ChangeLogAddIn
Changed paths:
M main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
M main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
M main/src/addins/ChangeLogAddIn/ChangeLogService.cs
M main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
M main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
Modified: main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
===================================================================
@@ -33,12 +33,12 @@
namespace MonoDevelop.ChangeLogAddIn
{
- internal partial class AddLogEntryDialog : Gtk.Dialog
+ partial class AddLogEntryDialog : Dialog
{
- ListStore store;
- Dictionary<ChangeLogEntry,string> changes = new Dictionary<ChangeLogEntry,string> ();
- TextMark editMark;
- TextTag oldTextTag;
+ readonly ListStore store;
+ readonly Dictionary<ChangeLogEntry, string> changes = new Dictionary<ChangeLogEntry, string> ();
+ readonly TextMark editMark;
+ readonly TextTag oldTextTag;
bool loading;
public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
@@ -52,8 +52,8 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
Pango.TabArray tabs = new Pango.TabArray (1, true);
tabs.SetTab (0, Pango.TabAlign.Left, GetStringWidth (" ") * 4);
textview.Tabs = tabs;
- textview.SizeRequested += delegate (object o, SizeRequestedArgs args) {
- textview.WidthRequest = GetStringWidth (string.Empty.PadRight (80));
+ textview.SizeRequested += delegate {
+ textview.WidthRequest = GetStringWidth (String.Empty.PadRight (80));
};
font.Dispose ();
@@ -66,9 +66,9 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
foreach (ChangeLogEntry ce in entries.Values) {
Gdk.Pixbuf pic;
if (ce.CantGenerate)
- pic = ImageService.GetPixbuf (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.DialogWarning, IconSize.Menu);
else if (ce.IsNew)
- pic = ImageService.GetPixbuf (Gtk.Stock.New, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.New, IconSize.Menu);
else
pic = null;
store.AppendValues (ce, pic, ce.File);
@@ -78,7 +78,7 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
TreeIter it;
editMark = textview.Buffer.CreateMark (null, textview.Buffer.EndIter, false);
- oldTextTag = new Gtk.TextTag ("readonly");
+ oldTextTag = new TextTag ("readonly");
oldTextTag.Foreground = "gray";
oldTextTag.Editable = false;
textview.Buffer.TagTable.Add (oldTextTag);
@@ -87,10 +87,10 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
fileList.Selection.SelectIter (it);
}
- private int GetStringWidth (string str)
+ int GetStringWidth (string str)
{
int width, height;
- Pango.Layout layout = new Pango.Layout (textview.PangoContext);
+ var layout = new Pango.Layout (textview.PangoContext);
layout.SetText (str);
layout.GetPixelSize (out width, out height);
layout.Dispose ();
@@ -105,7 +105,7 @@ public void OnSelectionChanged (object s, EventArgs a)
textview.Sensitive = false;
} else {
textview.Sensitive = true;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
boxNewFile.Visible = ce.IsNew && !ce.CantGenerate;
boxNoFile.Visible = ce.CantGenerate;
loading = true;
@@ -132,7 +132,7 @@ public void OnTextChanged (object s, EventArgs a)
TreeIter it;
if (!fileList.Selection.GetSelected (out it))
return;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
changes [ce] = textview.Buffer.GetText (textview.Buffer.StartIter, textview.Buffer.GetIterAtMark (editMark), true);
}
Modified: main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
===================================================================
@@ -64,23 +64,21 @@ protected override void Update(CommandInfo info)
info.Enabled = false;
}
- private string GetSelectedFile()
+ static string GetSelectedFile()
{
if (IdeApp.Workbench.ActiveDocument != null) {
string fn = IdeApp.Workbench.ActiveDocument.FileName;
if (fn != null && Path.GetFileName (fn) != "ChangeLog")
return fn;
}
- ProjectFile file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
+ var file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
if (file != null)
return file.FilePath;
- SystemFile sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
- if (sf != null)
- return sf.Path;
- return null;
+ var sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
+ return sf != null ? sf.Path : null;
}
- private void InsertEntry(Document document)
+ static void InsertEntry(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return;
@@ -92,7 +90,7 @@ private void InsertEntry(Document document)
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
int pos = GetHeaderEndPosition (document);
- if (pos > 0 && selectedFileNameDirectory.StartsWith(changeLogFileNameDirectory)) {
+ if (pos > 0 && selectedFileNameDirectory.StartsWith (changeLogFileNameDirectory, StringComparison.Ordinal)) {
string text = "\t* "
+ selectedFileName.Substring(changeLogFileNameDirectory.Length + 1) + ": "
+ eol + eol;
@@ -107,7 +105,7 @@ private void InsertEntry(Document document)
}
}
- private bool InsertHeader (Document document)
+ static bool InsertHeader (Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return false;
@@ -133,7 +131,7 @@ private bool InsertHeader (Document document)
return true;
}
- private int GetHeaderEndPosition(Document document)
+ static int GetHeaderEndPosition(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return 0;
@@ -143,10 +141,10 @@ private int GetHeaderEndPosition(Document document)
string text = textBuffer.GetText (0, Math.Min (textBuffer.Length, 1023));
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
- return text.IndexOf (eol + eol);
+ return text.IndexOf (eol + eol, StringComparison.Ordinal);
}
- private Document GetActiveChangeLogDocument()
+ static Document GetActiveChangeLogDocument()
{
string file = GetSelectedFile ();
if (file == null)
Modified: main/src/addins/ChangeLogAddIn/ChangeLogService.cs
===================================================================
@@ -115,11 +115,7 @@ public static string GetChangeLogForFile (string baseCommitPath, string file)
public static CommitMessageStyle GetMessageStyle (SolutionItem item)
{
- ChangeLogPolicy policy;
- if (item != null)
- policy = GetPolicy (item);
- else
- policy = new ChangeLogPolicy ();
+ ChangeLogPolicy policy = item != null ? GetPolicy (item) : new ChangeLogPolicy ();
return policy.MessageStyle;
}
Modified: main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
===================================================================
@@ -32,7 +32,6 @@
using MonoDevelop.VersionControl;
using MonoDevelop.Core;
using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide;
using MonoDevelop.Projects;
@@ -40,10 +39,10 @@ namespace MonoDevelop.ChangeLogAddIn
{
public class CommitDialogExtensionWidget: CommitDialogExtension
{
- HBox box = new HBox ();
- VBox vbox = new VBox ();
- Button logButton;
- Button optionsButton;
+ readonly HBox box = new HBox ();
+ readonly VBox vbox = new VBox ();
+ readonly Button logButton;
+ readonly Button optionsButton;
ChangeSet cset;
Label msgLabel;
Label pathLabel;
@@ -65,18 +64,18 @@ public CommitDialogExtensionWidget()
optionsButton = new Button (GettextCatalog.GetString ("Options..."));
optionsButton.Clicked += OnClickOptions;
- VBox aux = new VBox ();
+ var aux = new VBox ();
box.PackStart (aux, false, false, 3);
- HBox haux = new HBox ();
+ var haux = new HBox ();
haux.Spacing = 6;
aux.PackStart (haux, false, false, 0);
haux.PackStart (logButton, false, false, 0);
haux.PackStart (optionsButton, false, false, 0);
}
- public override bool Initialize (ChangeSet cset)
+ public override bool Initialize (ChangeSet changeSet)
{
- this.cset = cset;
+ cset = changeSet;
msgLabel = new Label ();
pathLabel = new Label ();
msgLabel.Xalign = 0;
@@ -227,7 +226,7 @@ void GenerateLogEntries ()
requireComment = false;
foreach (ChangeSetItem item in cset.Items) {
- MonoDevelop.Projects.SolutionItem parentItem;
+ SolutionItem parentItem;
ChangeLogPolicy policy;
string logf = ChangeLogService.GetChangeLogForFile (cset.BaseLocalPath, item.LocalPath,
out parentItem, out policy);
@@ -246,8 +245,7 @@ void GenerateLogEntries ()
if (string.IsNullOrEmpty (item.Comment) && !item.IsDirectory) {
uncommentedCount++;
- if (policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry)
- requireComment = true;
+ requireComment |= policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry;
}
ChangeLogEntry entry;
@@ -260,15 +258,14 @@ void GenerateLogEntries ()
if (cantGenerate)
unknownFileCount++;
- if (!File.Exists (logf))
- entry.IsNew = true;
+ entry.IsNew |= !File.Exists (logf);
entries [logf] = entry;
}
entry.Items.Add (item);
}
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.TabsAsSpaces = false;
format.TabWidth = 8;
format.MaxColumns = 70;
@@ -283,19 +280,19 @@ void GenerateLogEntries ()
void OnClickButton (object s, EventArgs args)
{
if (notConfigured) {
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
return;
}
var dlg = new AddLogEntryDialog (entries);
- MessageService.ShowCustomDialog (dlg, (Gtk.Window) Toplevel);
+ MessageService.ShowCustomDialog (dlg, (Window) Toplevel);
}
void OnClickOptions (object s, EventArgs args)
{
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
}
Modified: main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.ChangeLogAddIn
class OldChangeLogData
{
[ItemProperty]
- ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
+ readonly ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
OldChangeLogData ()
{
@@ -55,7 +55,7 @@ public static void Migrate (SolutionItem entry)
if (entry.ParentFolder != null)
Migrate (entry.ParentFolder);
- OldChangeLogData data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
+ var data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
if (data == null)
return;
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
===================================================================
@@ -43,11 +43,14 @@ public override Widget CreatePanelWidget ()
public override void Initialize (OptionsDialog dialog, object dataObject)
{
- if (dataObject is SolutionItem)
- OldChangeLogData.Migrate ((SolutionItem)dataObject);
- else if (dataObject is Solution)
- OldChangeLogData.Migrate (((Solution)dataObject).RootFolder);
-
+ var solutionItem = dataObject as SolutionItem;
+ if (solutionItem != null)
+ OldChangeLogData.Migrate (solutionItem);
+ else {
+ var solution = dataObject as Solution;
+ if (solution != null)
+ OldChangeLogData.Migrate (solution.RootFolder);
+ }
base.Initialize (dialog, dataObject);
}
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
===================================================================
@@ -25,16 +25,14 @@
//
//
-using System;
using MonoDevelop.Projects;
using MonoDevelop.VersionControl;
-using MonoDevelop.Ide;
namespace MonoDevelop.ChangeLogAddIn
{
partial class ProjectOptionPanelWidget : Gtk.Bin
{
- ProjectOptionPanel parent;
+ readonly ProjectOptionPanel parent;
CommitMessageStyle style;
public ProjectOptionPanelWidget (ProjectOptionPanel parent)
@@ -60,13 +58,13 @@ public void LoadFrom (ChangeLogPolicy policy)
break;
}
- this.checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
- this.checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
+ checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
+ checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
style = new CommitMessageStyle ();
style.CopyFrom (policy.MessageStyle);
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.MaxColumns = 70;
format.Style = style;
Commit: f8463b9029b2dabd6b666aeed91dcd239fd482bc
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 16:13:28 GMT
URL: https://github.com/mono/monodevelop/commit/f8463b9029b2dabd6b666aeed91dcd239fd482bc
[Subversion] Win32 cleanup.
Changed paths:
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
Modified: main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
===================================================================
@@ -48,7 +48,7 @@ public override bool IsInstalled
{
if (!errorShown && installError) {
errorShown = true;
- AlertButton db = new AlertButton ("Go to Download Page");
+ var db = new AlertButton ("Go to Download Page");
AlertButton res = MessageService.AskQuestion ("The Subversion add-in could not be initialized", "This add-in requires the 'Microsoft Visual C++ 2005 Service Pack 1 Redistributable'. You may need to install it.", db, AlertButton.Ok);
if (res == db) {
DesktopService.ShowUrl ("http://www.microsoft.com/downloads/details.aspx?familyid=766a6af7-ec73-40ff-b072-9112bab119c2");
@@ -84,7 +84,7 @@ sealed class SvnSharpBackend: SubversionBackend
public override string GetTextBase (string sourcefile)
{
- MemoryStream data = new MemoryStream ();
+ var data = new MemoryStream ();
try {
// This outputs the contents of the base revision
// of a file to a stream.
@@ -108,11 +108,11 @@ public SvnSharpBackend ()
void Init ()
{
client = new SvnClient ();
- client.Authentication.SslClientCertificateHandlers += new EventHandler<SvnSslClientCertificateEventArgs> (AuthenticationSslClientCertificateHandlers);
- client.Authentication.SslClientCertificatePasswordHandlers += new EventHandler<SvnSslClientCertificatePasswordEventArgs> (AuthenticationSslClientCertificatePasswordHandlers);
- client.Authentication.SslServerTrustHandlers += new EventHandler<SvnSslServerTrustEventArgs> (AuthenticationSslServerTrustHandlers);
- client.Authentication.UserNameHandlers += new EventHandler<SvnUserNameEventArgs> (AuthenticationUserNameHandlers);
- client.Authentication.UserNamePasswordHandlers += new EventHandler<SvnUserNamePasswordEventArgs> (AuthenticationUserNamePasswordHandlers);
+ client.Authentication.SslClientCertificateHandlers += AuthenticationSslClientCertificateHandlers;
+ client.Authentication.SslClientCertificatePasswordHandlers += AuthenticationSslClientCertificatePasswordHandlers;
+ client.Authentication.SslServerTrustHandlers += AuthenticationSslServerTrustHandlers;
+ client.Authentication.UserNameHandlers += AuthenticationUserNameHandlers;
+ client.Authentication.UserNamePasswordHandlers += AuthenticationUserNamePasswordHandlers;
client.Notify += delegate (object o, SvnNotifyEventArgs e) {
if (updateMonitor == null)
return;
@@ -139,7 +139,7 @@ void Init ()
};
}
- void AuthenticationUserNamePasswordHandlers (object sender, SvnUserNamePasswordEventArgs e)
+ static void AuthenticationUserNamePasswordHandlers (object sender, SvnUserNamePasswordEventArgs e)
{
string user = e.UserName;
string password;
@@ -150,7 +150,7 @@ void AuthenticationUserNamePasswordHandlers (object sender, SvnUserNamePasswordE
e.Save = save;
}
- void AuthenticationUserNameHandlers (object sender, SvnUserNameEventArgs e)
+ static void AuthenticationUserNameHandlers (object sender, SvnUserNameEventArgs e)
{
string name = e.UserName;
bool save;
@@ -159,12 +159,12 @@ void AuthenticationUserNameHandlers (object sender, SvnUserNameEventArgs e)
e.Save = save;
}
- void AuthenticationSslServerTrustHandlers (object sender, SvnSslServerTrustEventArgs e)
+ static void AuthenticationSslServerTrustHandlers (object sender, SvnSslServerTrustEventArgs e)
{
SslFailure acceptedFailures;
bool save;
- CertficateInfo certInfo = new CertficateInfo ();
+ var certInfo = new CertficateInfo ();
certInfo.AsciiCert = e.CertificateValue;
certInfo.Fingerprint = e.Fingerprint;
certInfo.HostName = e.CommonName;
@@ -178,7 +178,7 @@ void AuthenticationSslServerTrustHandlers (object sender, SvnSslServerTrustEvent
e.Save = save;
}
- void AuthenticationSslClientCertificatePasswordHandlers (object sender, SvnSslClientCertificatePasswordEventArgs e)
+ static void AuthenticationSslClientCertificatePasswordHandlers (object sender, SvnSslClientCertificatePasswordEventArgs e)
{
string password;
bool save;
@@ -187,7 +187,7 @@ void AuthenticationSslClientCertificatePasswordHandlers (object sender, SvnSslCl
e.Save = save;
}
- void AuthenticationSslClientCertificateHandlers (object sender, SvnSslClientCertificateEventArgs e)
+ static void AuthenticationSslClientCertificateHandlers (object sender, SvnSslClientCertificateEventArgs e)
{
string file;
bool save;
@@ -198,8 +198,8 @@ void AuthenticationSslClientCertificateHandlers (object sender, SvnSslClientCert
public override void Add (FilePath path, bool recurse, IProgressMonitor monitor)
{
- SvnAddArgs args = new SvnAddArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnAddArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Empty;
lock (client)
client.Add (path, args);
@@ -207,8 +207,8 @@ public override void Add (FilePath path, bool recurse, IProgressMonitor monitor)
public override void Checkout (string url, FilePath path, Revision rev, bool recurse, IProgressMonitor monitor)
{
- SvnCheckOutArgs args = new SvnCheckOutArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnCheckOutArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Empty;
lock (client) {
try {
@@ -222,8 +222,8 @@ public override void Checkout (string url, FilePath path, Revision rev, bool rec
public override void Commit (FilePath[] paths, string message, IProgressMonitor monitor)
{
- SvnCommitArgs args = new SvnCommitArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnCommitArgs ();
+ BindMonitor (monitor);
args.LogMessage = message;
lock (client)
client.Commit (paths.ToStringArray (), args);
@@ -231,8 +231,8 @@ public override void Commit (FilePath[] paths, string message, IProgressMonitor
public override void Delete (FilePath path, bool force, IProgressMonitor monitor)
{
- SvnDeleteArgs args = new SvnDeleteArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnDeleteArgs ();
+ BindMonitor (monitor);
args.Force = force;
lock (client)
client.Delete (path, args);
@@ -246,10 +246,10 @@ public override string GetTextAtRevision (string repositoryPath, Revision revisi
public override string GetTextAtRevision (string repositoryPath, Revision revision, string rootPath)
{
- MemoryStream ms = new MemoryStream ();
+ var ms = new MemoryStream ();
SvnUriTarget target = client.GetUriFromWorkingCopy (rootPath);
// Redo path link.
- repositoryPath = repositoryPath.TrimStart (new char[] { '/' });
+ repositoryPath = repositoryPath.TrimStart (new [] { '/' });
foreach (var segment in target.Uri.Segments) {
if (repositoryPath.StartsWith (segment, StringComparison.Ordinal))
repositoryPath = repositoryPath.Remove (0, segment.Length);
@@ -291,14 +291,14 @@ public override IEnumerable<DirectoryEntry> List (FilePath path, bool recurse, S
IEnumerable<DirectoryEntry> List (SvnTarget target, bool recurse)
{
- List<DirectoryEntry> list = new List<DirectoryEntry> ();
- SvnListArgs args = new SvnListArgs ();
+ var list = new List<DirectoryEntry> ();
+ var args = new SvnListArgs ();
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children;
lock (client)
client.List (target, args, delegate (object o, SvnListEventArgs a) {
if (string.IsNullOrEmpty (a.Path))
return;
- DirectoryEntry de = new DirectoryEntry ();
+ var de = new DirectoryEntry ();
de.CreatedRevision = ToBaseRevision (a.Entry.Revision).Rev;
de.HasProps = a.Entry.HasProperties;
de.IsDirectory = a.Entry.NodeKind == SvnNodeKind.Directory;
@@ -313,18 +313,18 @@ IEnumerable<DirectoryEntry> List (SvnTarget target, bool recurse)
public override IEnumerable<SvnRevision> Log (Repository repo, FilePath path, SvnRevision revisionStart, SvnRevision revisionEnd)
{
- List<SvnRevision> list = new List<SvnRevision> ();
- SvnLogArgs args = new SvnLogArgs ();
+ var list = new List<SvnRevision> ();
+ var args = new SvnLogArgs ();
args.Range = new SvnRevisionRange (GetRevision (revisionStart), GetRevision (revisionEnd));
lock (client)
client.Log (path, args, delegate (object o, SvnLogEventArgs a) {
- List<RevisionPath> paths = new List<RevisionPath> ();
- foreach (SvnChangeItem item in a.ChangedPaths) {
- paths.Add (new RevisionPath (item.Path, ConvertRevisionAction (item.Action), ""));
- }
- SvnRevision r = new SvnRevision (repo, (int) a.Revision, a.Time, a.Author, a.LogMessage, paths.ToArray ());
- list.Add (r);
- });
+ var paths = new List<RevisionPath> ();
+ foreach (SvnChangeItem item in a.ChangedPaths) {
+ paths.Add (new RevisionPath (item.Path, ConvertRevisionAction (item.Action), ""));
+ }
+ var r = new SvnRevision (repo, (int) a.Revision, a.Time, a.Author, a.LogMessage, paths.ToArray ());
+ list.Add (r);
+ });
return list;
}
@@ -341,10 +341,10 @@ static RevisionAction ConvertRevisionAction (SvnChangeAction svnChangeAction)
public override void Mkdir (string[] paths, string message, IProgressMonitor monitor)
{
- SvnCreateDirectoryArgs args = new SvnCreateDirectoryArgs ();
+ var args = new SvnCreateDirectoryArgs ();
args.CreateParents = true;
- BindMonitor (args, monitor);
- List<Uri> uris = new List<Uri> ();
+ BindMonitor (monitor);
+ var uris = new List<Uri> ();
foreach (string path in paths)
uris.Add (new Uri (path));
args.LogMessage = message;
@@ -354,8 +354,8 @@ public override void Mkdir (string[] paths, string message, IProgressMonitor mon
public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev, bool force, IProgressMonitor monitor)
{
- SvnMoveArgs args = new SvnMoveArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnMoveArgs ();
+ BindMonitor (monitor);
args.Force = force;
lock (client)
client.Move (srcPath, destPath, args);
@@ -363,23 +363,23 @@ public override void Move (FilePath srcPath, FilePath destPath, SvnRevision rev,
public override string GetUnifiedDiff (FilePath path1, SvnRevision revision1, FilePath path2, SvnRevision revision2, bool recursive)
{
- SvnPathTarget t1 = new SvnPathTarget (path1, GetRevision (revision1));
- SvnPathTarget t2 = new SvnPathTarget (path2, GetRevision (revision2));
- SvnDiffArgs args = new SvnDiffArgs ();
+ var t1 = new SvnPathTarget (path1, GetRevision (revision1));
+ var t2 = new SvnPathTarget (path2, GetRevision (revision2));
+ var args = new SvnDiffArgs ();
args.Depth = recursive ? SvnDepth.Infinity : SvnDepth.Children;
- MemoryStream ms = new MemoryStream ();
+ var ms = new MemoryStream ();
lock (client)
client.Diff (t1, t2, args, ms);
ms.Position = 0;
- using (StreamReader sr = new StreamReader (ms)) {
+ using (var sr = new StreamReader (ms)) {
return sr.ReadToEnd ();
}
}
public override void Revert (FilePath[] paths, bool recurse, IProgressMonitor monitor)
{
- SvnRevertArgs args = new SvnRevertArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnRevertArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children;
lock (client)
client.Revert (paths.ToStringArray (), args);
@@ -387,36 +387,34 @@ public override void Revert (FilePath[] paths, bool recurse, IProgressMonitor mo
public override void RevertRevision (FilePath path, Revision revision, IProgressMonitor monitor)
{
- SvnMergeArgs args = new SvnMergeArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnMergeArgs ();
+ BindMonitor (monitor);
Revision prev = ((SvnRevision) revision).GetPrevious ();
- SvnRevisionRange range = new SvnRevisionRange (GetRevision (revision), GetRevision (prev));
+ var range = new SvnRevisionRange (GetRevision (revision), GetRevision (prev));
lock (client)
client.Merge (path, new SvnPathTarget (path), range, args);
}
public override void RevertToRevision (FilePath path, Revision revision, IProgressMonitor monitor)
{
- SvnMergeArgs args = new SvnMergeArgs ();
- BindMonitor (args, monitor);
- SvnRevisionRange range = new SvnRevisionRange (GetRevision (SvnRevision.Head), GetRevision (revision));
+ var args = new SvnMergeArgs ();
+ BindMonitor (monitor);
+ var range = new SvnRevisionRange (GetRevision (SvnRevision.Head), GetRevision (revision));
lock (client)
client.Merge (path, new SvnPathTarget (path), range, args);
}
public override IEnumerable<VersionInfo> Status (Repository repo, FilePath path, SvnRevision revision, bool descendDirs, bool changedItemsOnly, bool remoteStatus)
{
- List<VersionInfo> list = new List<VersionInfo> ();
- SvnStatusArgs args = new SvnStatusArgs ();
+ var list = new List<VersionInfo> ();
+ var args = new SvnStatusArgs ();
args.Revision = GetRevision (revision);
args.Depth = descendDirs ? SvnDepth.Infinity : SvnDepth.Children;
args.RetrieveAllEntries = !changedItemsOnly;
args.RetrieveRemoteStatus = remoteStatus;
lock (client) {
try {
- client.Status (path, args, delegate (object o, SvnStatusEventArgs a) {
- list.Add (CreateVersionInfo (repo, a));
- });
+ client.Status (path, args, (o, a) => list.Add (CreateVersionInfo (repo, a)));
} catch (SvnInvalidNodeKindException e) {
if (e.SvnErrorCode == SvnErrorCode.SVN_ERR_WC_NOT_WORKING_COPY)
list.Add (VersionInfo.CreateUnversioned (e.File, true));
@@ -463,7 +461,7 @@ static VersionInfo CreateVersionInfo (Repository repo, SvnStatusEventArgs ent)
if (ent.WorkingCopyInfo != null)
newRev = new SvnRevision (repo, (int) ent.WorkingCopyInfo.Revision);
- VersionInfo ret = new VersionInfo (ent.FullPath, repoPath, ent.NodeKind == SvnNodeKind.Directory,
+ var ret = new VersionInfo (ent.FullPath, repoPath, ent.NodeKind == SvnNodeKind.Directory,
status, newRev,
rs, rr);
return ret;
@@ -496,8 +494,8 @@ static VersionStatus ConvertStatus (SvnSchedule schedule, SvnStatus status)
public override void Lock (IProgressMonitor monitor, string comment, bool stealLock, params FilePath[] paths)
{
- SvnLockArgs args = new SvnLockArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnLockArgs ();
+ BindMonitor (monitor);
args.Comment = comment;
args.StealLock = stealLock;
lock (client)
@@ -506,8 +504,8 @@ public override void Lock (IProgressMonitor monitor, string comment, bool stealL
public override void Unlock (IProgressMonitor monitor, bool breakLock, params FilePath[] paths)
{
- SvnUnlockArgs args = new SvnUnlockArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnUnlockArgs ();
+ BindMonitor (monitor);
args.BreakLock = breakLock;
lock (client)
client.Unlock (paths.ToStringArray (), args);
@@ -515,8 +513,8 @@ public override void Unlock (IProgressMonitor monitor, bool breakLock, params Fi
public override void Update (FilePath path, bool recurse, IProgressMonitor monitor)
{
- SvnUpdateArgs args = new SvnUpdateArgs ();
- BindMonitor (args, monitor);
+ var args = new SvnUpdateArgs ();
+ BindMonitor (monitor);
args.Depth = recurse ? SvnDepth.Infinity : SvnDepth.Children;
client.Update (path, args);
}
@@ -552,24 +550,24 @@ public override Annotation[] GetAnnotations (Repository repo, FilePath file, Svn
if (file == FilePath.Null)
throw new ArgumentNullException ();
- SvnPathTarget target = new SvnPathTarget (file, SharpSvn.SvnRevision.Base);
- MemoryStream data = new MemoryStream ();
+ var target = new SvnPathTarget (file, SharpSvn.SvnRevision.Base);
+ var data = new MemoryStream ();
int numAnnotations = 0;
client.Write (target, data);
- using (StreamReader reader = new StreamReader (data)) {
+ using (var reader = new StreamReader (data)) {
reader.BaseStream.Seek (0, SeekOrigin.Begin);
while (reader.ReadLine () != null)
numAnnotations++;
}
System.Collections.ObjectModel.Collection<SvnBlameEventArgs> list;
- SvnBlameArgs args = new SvnBlameArgs ();
+ var args = new SvnBlameArgs ();
args.Start = GetRevision (revStart);
args.End = GetRevision (revEnd);
if (client.GetBlame (target, args, out list)) {
- Annotation[] annotations = new Annotation [numAnnotations];
+ var annotations = new Annotation [numAnnotations];
foreach (var annotation in list) {
if (annotation.LineNumber < annotations.Length)
annotations [(int)annotation.LineNumber] = new Annotation (annotation.Revision.ToString (),
@@ -584,7 +582,7 @@ static SharpSvn.SvnRevision GetRevision (Revision rev)
{
if (rev == null)
return null;
- SvnRevision srev = (SvnRevision) rev;
+ var srev = (SvnRevision) rev;
if (srev == SvnRevision.Base)
return new SharpSvn.SvnRevision (SvnRevisionType.Base);
if (srev == SvnRevision.Committed)
@@ -630,7 +628,7 @@ class ProgressData
public int Seconds;
}
- void BindMonitor (SvnClientArgs args, IProgressMonitor monitor)
+ void BindMonitor (IProgressMonitor monitor)
{
notifyData = new NotifData ();
progressData = new ProgressData ();
@@ -690,106 +688,101 @@ static void Notify (SvnNotifyEventArgs e, NotifData notifData, IProgressMonitor
bool notifyChange = false;
switch (e.Action) {
- case SvnNotifyAction.Skip:
- if (e.ContentState == SvnNotifyState.Missing) {
- actiondesc = string.Format (GettextCatalog.GetString ("Skipped missing target: '{0}'"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Skipped '{0}'"), file);
- }
- break;
- case SvnNotifyAction.UpdateDelete:
- actiondesc = string.Format (GettextCatalog.GetString ("Deleted '{0}'"), file);
- break;
-
- case SvnNotifyAction.UpdateAdd:
- if (e.ContentState == SvnNotifyState.Conflicted) {
- actiondesc = string.Format (GettextCatalog.GetString ("Conflict {0}"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Added {0}"), file);
- }
- break;
- case SvnNotifyAction.Restore:
- actiondesc = string.Format (GettextCatalog.GetString ("Restored '{0}'"), file);
- break;
- case SvnNotifyAction.Revert:
- actiondesc = string.Format (GettextCatalog.GetString ("Reverted '{0}'"), file);
- break;
- case SvnNotifyAction.RevertFailed:
- actiondesc = string.Format (GettextCatalog.GetString ("Failed to revert '{0}' -- try updating instead."), file);
- break;
- case SvnNotifyAction.Resolved:
- actiondesc = string.Format (GettextCatalog.GetString ("Resolved conflict state of '{0}'"), file);
- break;
- case SvnNotifyAction.Add:
- if (e.MimeTypeIsBinary) {
- actiondesc = string.Format (GettextCatalog.GetString ("Add (bin) '{0}'"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Add '{0}'"), file);
- }
- break;
- case SvnNotifyAction.Delete:
- actiondesc = string.Format (GettextCatalog.GetString ("Delete '{0}'"), file);
- break;
-
- case SvnNotifyAction.UpdateUpdate:
- actiondesc = string.Format (GettextCatalog.GetString ("Update '{0}'"), file);
- notifyChange = true;
- break;
- case SvnNotifyAction.UpdateExternal:
- actiondesc = string.Format (GettextCatalog.GetString ("Fetching external item into '{0}'"), file);
- break;
- case SvnNotifyAction.UpdateCompleted: // TODO
- actiondesc = GettextCatalog.GetString ("Finished");
- break;
- case SvnNotifyAction.StatusExternal:
- actiondesc = string.Format (GettextCatalog.GetString ("Performing status on external item at '{0}'"), file);
- break;
- case SvnNotifyAction.StatusCompleted:
- actiondesc = string.Format (GettextCatalog.GetString ("Status against revision: '{0}'"), e.Revision);
- break;
-
- case SvnNotifyAction.CommitDeleted:
- actiondesc = string.Format (GettextCatalog.GetString ("Deleting {0}"), file);
- break;
- case SvnNotifyAction.CommitModified:
- actiondesc = string.Format (GettextCatalog.GetString ("Sending {0}"), file);
- notifyChange = true;
- break;
- case SvnNotifyAction.CommitAdded:
- if (e.MimeTypeIsBinary) {
- actiondesc = string.Format (GettextCatalog.GetString ("Adding (bin) '{0}'"), file);
- }
- else {
- actiondesc = string.Format (GettextCatalog.GetString ("Adding '{0}'"), file);
- }
- break;
- case SvnNotifyAction.CommitReplaced:
- actiondesc = string.Format (GettextCatalog.GetString ("Replacing {0}"), file);
- notifyChange = true;
- break;
- case SvnNotifyAction.CommitSendData:
- if (!notifData.SendingData) {
- notifData.SendingData = true;
- actiondesc = GettextCatalog.GetString ("Transmitting file data");
- }
- else {
- actiondesc = ".";
- skipEol = true;
- }
- break;
-
- case SvnNotifyAction.LockLocked:
- actiondesc = string.Format (GettextCatalog.GetString ("'{0}' locked by user '{1}'."), file, e.Lock.Owner);
- break;
- case SvnNotifyAction.LockUnlocked:
- actiondesc = string.Format (GettextCatalog.GetString ("'{0}' unlocked."), file);
- break;
- default:
- actiondesc = e.Action.ToString () + " " + file;
- break;
+ case SvnNotifyAction.Skip:
+ if (e.ContentState == SvnNotifyState.Missing) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Skipped missing target: '{0}'"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Skipped '{0}'"), file);
+ }
+ break;
+ case SvnNotifyAction.UpdateDelete:
+ actiondesc = string.Format (GettextCatalog.GetString ("Deleted '{0}'"), file);
+ break;
+
+ case SvnNotifyAction.UpdateAdd:
+ if (e.ContentState == SvnNotifyState.Conflicted) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Conflict {0}"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Added {0}"), file);
+ }
+ break;
+ case SvnNotifyAction.Restore:
+ actiondesc = string.Format (GettextCatalog.GetString ("Restored '{0}'"), file);
+ break;
+ case SvnNotifyAction.Revert:
+ actiondesc = string.Format (GettextCatalog.GetString ("Reverted '{0}'"), file);
+ break;
+ case SvnNotifyAction.RevertFailed:
+ actiondesc = string.Format (GettextCatalog.GetString ("Failed to revert '{0}' -- try updating instead."), file);
+ break;
+ case SvnNotifyAction.Resolved:
+ actiondesc = string.Format (GettextCatalog.GetString ("Resolved conflict state of '{0}'"), file);
+ break;
+ case SvnNotifyAction.Add:
+ if (e.MimeTypeIsBinary) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Add (bin) '{0}'"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Add '{0}'"), file);
+ }
+ break;
+ case SvnNotifyAction.Delete:
+ actiondesc = string.Format (GettextCatalog.GetString ("Delete '{0}'"), file);
+ break;
+
+ case SvnNotifyAction.UpdateUpdate:
+ actiondesc = string.Format (GettextCatalog.GetString ("Update '{0}'"), file);
+ notifyChange = true;
+ break;
+ case SvnNotifyAction.UpdateExternal:
+ actiondesc = string.Format (GettextCatalog.GetString ("Fetching external item into '{0}'"), file);
+ break;
+ case SvnNotifyAction.UpdateCompleted: // TODO
+ actiondesc = GettextCatalog.GetString ("Finished");
+ break;
+ case SvnNotifyAction.StatusExternal:
+ actiondesc = string.Format (GettextCatalog.GetString ("Performing status on external item at '{0}'"), file);
+ break;
+ case SvnNotifyAction.StatusCompleted:
+ actiondesc = string.Format (GettextCatalog.GetString ("Status against revision: '{0}'"), e.Revision);
+ break;
+
+ case SvnNotifyAction.CommitDeleted:
+ actiondesc = string.Format (GettextCatalog.GetString ("Deleting {0}"), file);
+ break;
+ case SvnNotifyAction.CommitModified:
+ actiondesc = string.Format (GettextCatalog.GetString ("Sending {0}"), file);
+ notifyChange = true;
+ break;
+ case SvnNotifyAction.CommitAdded:
+ if (e.MimeTypeIsBinary) {
+ actiondesc = string.Format (GettextCatalog.GetString ("Adding (bin) '{0}'"), file);
+ } else {
+ actiondesc = string.Format (GettextCatalog.GetString ("Adding '{0}'"), file);
+ }
+ break;
+ case SvnNotifyAction.CommitReplaced:
+ actiondesc = string.Format (GettextCatalog.GetString ("Replacing {0}"), file);
+ notifyChange = true;
+ break;
+ case SvnNotifyAction.CommitSendData:
+ if (!notifData.SendingData) {
+ notifData.SendingData = true;
+ actiondesc = GettextCatalog.GetString ("Transmitting file data");
+ } else {
+ actiondesc = ".";
+ skipEol = true;
+ }
+ break;
+
+ case SvnNotifyAction.LockLocked:
+ actiondesc = string.Format (GettextCatalog.GetString ("'{0}' locked by user '{1}'."), file, e.Lock.Owner);
+ break;
+ case SvnNotifyAction.LockUnlocked:
+ actiondesc = string.Format (GettextCatalog.GetString ("'{0}' unlocked."), file);
+ break;
+ default:
+ actiondesc = e.Action + " " + file;
+ break;
}
if (monitor != null) {
Commit: 1cff4775267e49c1e175aae9a6d55aab5fbf3b93
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 16:16:30 GMT
URL: https://github.com/mono/monodevelop/commit/1cff4775267e49c1e175aae9a6d55aab5fbf3b93
[Subversion] Win32 speed-ups by using some already evaluated properties.
Changed paths:
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
Modified: main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
===================================================================
@@ -439,15 +439,14 @@ static VersionInfo CreateVersionInfo (Repository repo, SvnStatusEventArgs ent)
ent.RemoteUpdateCommitAuthor, "(unavailable)", null);
}
- SvnSchedule sched = ent.WorkingCopyInfo != null ? ent.WorkingCopyInfo.Schedule : SvnSchedule.Normal;
- VersionStatus status = ConvertStatus (sched, ent.LocalContentStatus);
+ VersionStatus status = ConvertStatus (SvnSchedule.Normal, ent.LocalContentStatus);
bool readOnly = File.Exists (ent.FullPath) && (File.GetAttributes (ent.FullPath) & FileAttributes.ReadOnly) != 0;
if (ent.WorkingCopyInfo != null) {
- if (ent.RemoteLock != null || ent.WorkingCopyInfo.LockToken != null) {
+ if (ent.RemoteLock != null || ent.LocalLock != null) {
status |= VersionStatus.LockRequired;
- if (ent.WorkingCopyInfo.LockToken != null || (ent.RemoteLock != null && ent.RemoteLock.Token != null))
+ if (ent.LocalLock != null || (ent.RemoteLock != null && ent.RemoteLock.Token != null))
status |= VersionStatus.LockOwned;
else
status |= VersionStatus.Locked;
@@ -459,7 +458,7 @@ static VersionInfo CreateVersionInfo (Repository repo, SvnStatusEventArgs ent)
string repoPath = ent.Uri != null ? ent.Uri.ToString () : null;
SvnRevision newRev = null;
if (ent.WorkingCopyInfo != null)
- newRev = new SvnRevision (repo, (int) ent.WorkingCopyInfo.Revision);
+ newRev = new SvnRevision (repo, (int) ent.Revision);
var ret = new VersionInfo (ent.FullPath, repoPath, ent.NodeKind == SvnNodeKind.Directory,
status, newRev,
Commit: f29b8c48c4a8eb8be93dfb6dd6bd56d0c820381d
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-04 16:16:55 GMT
URL: https://github.com/mono/monodevelop/commit/f29b8c48c4a8eb8be93dfb6dd6bd56d0c820381d
[ConsoleProgressMonitor] Add a comment about .NET 4.5 way of avoiding exception.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/ConsoleProgressMonitor.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/ConsoleProgressMonitor.cs
===================================================================
@@ -50,6 +50,7 @@ public class ConsoleProgressMonitor: NullProgressMonitor
public ConsoleProgressMonitor () : this (Console.Out)
{
//TODO: can we efficiently update Console.WindowWidth when it changes?
+ // TODO: Use Console.IsOutputRedirected in .NET 4.5.
try {
columns = Console.WindowWidth;
}
Commit: 01f2eba0da64a457cf7c09683a011b0d6296e839
Author: Alex Corrado <[email protected]> (chkn)
Date: 2013-11-04 21:39:21 GMT
URL: https://github.com/mono/monodevelop/commit/01f2eba0da64a457cf7c09683a011b0d6296e839
[build] Bump md-addins
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=bc719efa0e02d1bdefcad9a2225a86e307a57db7
+DEP_NEEDED_VERSION[0]=a7ce288830ba36dcb13147d908f214500665b5c0
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: bf8fd98ff7fa23da7160e5b7c69d90ec168610a3
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-05 14:25:05 GMT
URL: https://github.com/mono/monodevelop/commit/bf8fd98ff7fa23da7160e5b7c69d90ec168610a3
Merge pull request #428 from mono/brand
[Branding] Brand user-visible strings.
Changed paths:
M main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/AddinSetupService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/BuildTool.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
M main/src/tools/mdtool/src/mdtool.cs
Modified: main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
===================================================================
@@ -42,7 +42,7 @@ class GettextTool: IApplication
public int Run (string[] arguments)
{
- Console.WriteLine ("MonoDevelop Gettext Update Tool");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Gettext Update Tool"));
foreach (string s in arguments)
ReadArgument (s);
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/AddinSetupService.cs
===================================================================
@@ -47,7 +47,7 @@ public void RegisterMainRepository (UpdateLevel level, bool enable)
string url = GetMainRepositoryUrl (level);
if (!Repositories.ContainsRepository (url)) {
var rep = Repositories.RegisterRepository (null, url, false);
- rep.Name = "MonoDevelop Add-in Repository";
+ rep.Name = BrandingService.BrandApplicationName ("MonoDevelop Add-in Repository");
if (level != UpdateLevel.Stable)
rep.Name += " (" + level + " channel)";
if (!enable)
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/BuildTool.cs
===================================================================
@@ -48,7 +48,7 @@ internal class BuildTool : IApplication
public int Run (string[] arguments)
{
- Console.WriteLine ("MonoDevelop Build Tool");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Build Tool"));
foreach (string s in arguments)
ReadArgument (s);
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs
===================================================================
@@ -63,7 +63,7 @@ public override void RequestFileEdit (IEnumerable<FilePath> files)
return;
var btn = new AlertButton (GettextCatalog.GetString ("Make Writable"));
- var res = MessageService.AskQuestion (error, GettextCatalog.GetString ("Would you like MonoDevelop to attempt to make the file writable and try again?"), btn, AlertButton.Cancel);
+ var res = MessageService.AskQuestion (error, GettextCatalog.GetString ("Would you like {0} to attempt to make the file writable and try again?", BrandingService.ApplicationName), btn, AlertButton.Cancel);
if (res == AlertButton.Cancel)
throw new UserException (error) { AlreadyReportedToUser = true };
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
===================================================================
@@ -97,7 +97,7 @@ public static void SendFeedback (string email, string body)
PropertyService.Set ("MonoDevelop.Feedback.Email", email);
PropertyService.SaveProperties ();
- string header = "MonoDevelop: " + BuildInfo.VersionLabel + "\n";
+ string header = BrandingService.BrandApplicationName ("MonoDevelop: ") + BuildInfo.VersionLabel + "\n";
Type t = Type.GetType ("Mono.Runtime");
if (t != null) {
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
===================================================================
@@ -455,7 +455,7 @@ static void ValidateGtkTheme (ref string theme)
"set it as your default in the GTK+ Theme Selector or MonoDevelop Preferences.";
}
- MessageService.GenericAlert (Gtk.Stock.DialogWarning, message, detail, AlertButton.Ok);
+ MessageService.GenericAlert (Gtk.Stock.DialogWarning, message, BrandingService.BrandApplicationName (detail), AlertButton.Ok);
theme = fallback ?? themes.FirstOrDefault () ?? theme;
}
Modified: main/src/tools/mdtool/src/mdtool.cs
===================================================================
@@ -154,7 +154,7 @@ static void ShowHelp (bool shortHelp)
return;
}
Console.WriteLine ();
- Console.WriteLine ("MonoDevelop Tool Runner");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Tool Runner"));
Console.WriteLine ();
Console.WriteLine ("Usage: mdtool [options] <tool> ... : Runs a tool.");
Console.WriteLine (" mdtool setup ... : Runs the setup utility.");
@@ -169,7 +169,7 @@ static void ShowHelp (bool shortHelp)
static int RunSetup (string[] args)
{
- Console.WriteLine ("MonoDevelop Add-in Setup Utility");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Add-in Setup Utility"));
bool verbose = false;
foreach (string a in args)
if (a == "-v")
Commit: aff162200b65f95b099ad8671f8c2c6d3fa53bed
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-05 18:48:57 GMT
URL: https://github.com/mono/monodevelop/commit/aff162200b65f95b099ad8671f8c2c6d3fa53bed
[CorDebug] Fix property reading issues.
Changed paths:
M main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs
M main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataType.cs
Modified: main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs
===================================================================
@@ -83,6 +83,12 @@ internal MetadataPropertyInfo (IMetadataImport importer, int propertyToken, Meta
m_propAttributes = (PropertyAttributes) pdwPropFlags;
m_name = szProperty.ToString ();
MetadataHelperFunctions.GetCustomAttribute (importer, propertyToken, typeof (System.Diagnostics.DebuggerBrowsableAttribute));
+
+ if (!m_importer.IsValidToken ((uint)m_pmdGetter))
+ m_pmdGetter = 0;
+
+ if (!m_importer.IsValidToken ((uint)m_pmdSetter))
+ m_pmdSetter = 0;
}
public override PropertyAttributes Attributes
@@ -107,11 +113,15 @@ public override MethodInfo[] GetAccessors (bool nonPublic)
public override MethodInfo GetGetMethod (bool nonPublic)
{
- if (m_getter == null) {
- if (m_pmdGetter != 0)
- m_getter = new MetadataMethodInfo (m_importer, m_pmdGetter);
- }
- return m_getter;
+ if (m_pmdGetter == 0)
+ return null;
+
+ if (m_getter == null)
+ m_getter = new MetadataMethodInfo (m_importer, m_pmdGetter);
+
+ if (nonPublic || m_getter.IsPublic)
+ return m_getter;
+ return null;
}
public override ParameterInfo[] GetIndexParameters ( )
@@ -124,11 +134,15 @@ public override ParameterInfo[] GetIndexParameters ( )
public override MethodInfo GetSetMethod (bool nonPublic)
{
- if (m_setter == null) {
- if (m_pmdSetter != 0)
- m_setter = new MetadataMethodInfo (m_importer, m_pmdSetter);
- }
- return m_setter;
+ if (m_pmdSetter == 0)
+ return null;
+
+ if (m_setter == null)
+ m_setter = new MetadataMethodInfo (m_importer, m_pmdSetter);
+
+ if (nonPublic || m_setter.IsPublic)
+ return m_setter;
+ return null;
}
public override object GetValue (object obj, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture)
Modified: main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataType.cs
===================================================================
@@ -423,9 +423,9 @@ public override PropertyInfo[] GetProperties(BindingFlags bindingAttr)
break;
MetadataPropertyInfo prop = new MetadataPropertyInfo (m_importer, methodToken, this);
try {
- MethodInfo mi = prop.GetGetMethod ();
+ MethodInfo mi = prop.GetGetMethod () ?? prop.GetSetMethod ();
if (mi == null)
- mi = prop.GetSetMethod ();
+ continue;
if (FlagsMatch (mi.IsPublic, mi.IsStatic, bindingAttr))
al.Add (prop);
}
Commit: 81b16c3a2ef8636593dd9c8e60f97b32a5e11e9e
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-05 19:40:26 GMT
URL: https://github.com/mono/monodevelop/commit/81b16c3a2ef8636593dd9c8e60f97b32a5e11e9e
[Core] Fixed ProjectFile.ResourceId logic
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
===================================================================
@@ -397,12 +397,12 @@ internal bool ResolveParent ()
}
#endregion
+ // FIXME: rename this to LogicalName for a better mapping to the MSBuild property
public string ResourceId {
get {
- if (BuildAction != MonoDevelop.Projects.BuildAction.EmbeddedResource)
- return string.Empty;
- if (string.IsNullOrEmpty (resourceId) && project is DotNetProject)
+ if (BuildAction == MonoDevelop.Projects.BuildAction.EmbeddedResource && string.IsNullOrEmpty (resourceId) && project is DotNetProject)
return ((DotNetProject)project).ResourceHandler.GetDefaultResourceId (this);
+
return resourceId;
}
set {
Commit: 6472940571c82a184c174112f9de85a198c50a80
Author: lluis <[email protected]> (slluis)
Date: 2013-11-07 15:46:33 GMT
URL: https://github.com/mono/monodevelop/commit/6472940571c82a184c174112f9de85a198c50a80
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit dfc729dd856d1cceff7853a2648468d4f68d044e
+Subproject commit 4ba97a9b9735565e706c03c5755a648d997a52c6
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=a7ce288830ba36dcb13147d908f214500665b5c0
+DEP_NEEDED_VERSION[0]=0d8f9538ebd7b078b999fe0f0b2750027f304d8d
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: fc4cc021369004b76922c2241fa7428b8c4ad58c
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-07 18:06:20 GMT
URL: https://github.com/mono/monodevelop/commit/fc4cc021369004b76922c2241fa7428b8c4ad58c
bumped version-checks for md-addins afix
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=0d8f9538ebd7b078b999fe0f0b2750027f304d8d
+DEP_NEEDED_VERSION[0]=3d230f0a822fb49b50a280d108878bd91335b338
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 8a1703c7bd6b7d53d4234a94dfb34e47b1b40096
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-07 20:36:41 GMT
URL: https://github.com/mono/monodevelop/commit/8a1703c7bd6b7d53d4234a94dfb34e47b1b40096
[Debugger] code cleanup
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
===================================================================
@@ -45,23 +45,25 @@
namespace MonoDevelop.Debugger
{
[System.ComponentModel.ToolboxItem (true)]
- public class ObjectValueTreeView: Gtk.TreeView, ICompletionWidget
+ public class ObjectValueTreeView: TreeView, ICompletionWidget
{
- List<string> valueNames = new List<string> ();
- Dictionary<string,string> oldValues = new Dictionary<string,string> ();
- List<ObjectValue> values = new List<ObjectValue> ();
- Dictionary<ObjectValue,TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
- Dictionary<string,ObjectValue> cachedValues = new Dictionary<string,ObjectValue> ();
- Dictionary<ObjectValue, Task> expandTasks = new Dictionary<ObjectValue, Task> ();
- TreeStore store;
- TreeViewState state;
- string createMsg;
+ readonly Dictionary<ObjectValue, TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
+ readonly Dictionary<string, ObjectValue> cachedValues = new Dictionary<string, ObjectValue> ();
+ readonly Dictionary<ObjectValue, Task> expandTasks = new Dictionary<ObjectValue, Task> ();
+ readonly Dictionary<string, string> oldValues = new Dictionary<string, string> ();
+ readonly List<ObjectValue> values = new List<ObjectValue> ();
+ readonly List<string> valueNames = new List<string> ();
+
+ readonly Gdk.Pixbuf noLiveIcon;
+ readonly Gdk.Pixbuf liveIcon;
+
+ readonly TreeViewState state;
+ readonly TreeStore store;
+ readonly string createMsg;
bool restoringState = false;
bool compact;
StackFrame frame;
bool disposed;
- Gdk.Pixbuf noLiveIcon;
- Gdk.Pixbuf liveIcon;
bool columnsAdjusted;
bool columnSizesUpdating;
@@ -70,26 +72,26 @@ public class ObjectValueTreeView: Gtk.TreeView, ICompletionWidget
double valueColWidth;
double typeColWidth;
- CellRendererText crtExp;
- CellRendererText crtValue;
- CellRendererText crtType;
- CellRendererIcon crpButton;
- CellRendererIcon crpPin;
- CellRendererIcon crpLiveUpdate;
- CellRendererIcon crpViewer;
- Gtk.Entry editEntry;
+ readonly CellRendererText crtExp;
+ readonly CellRendererText crtValue;
+ readonly CellRendererText crtType;
+ readonly CellRendererIcon crpButton;
+ readonly CellRendererIcon crpPin;
+ readonly CellRendererIcon crpLiveUpdate;
+ readonly CellRendererIcon crpViewer;
+ Entry editEntry;
Mono.Debugging.Client.CompletionData currentCompletionData;
- TreeViewColumn expCol;
- TreeViewColumn valueCol;
- TreeViewColumn typeCol;
- TreeViewColumn pinCol;
+ readonly TreeViewColumn expCol;
+ readonly TreeViewColumn valueCol;
+ readonly TreeViewColumn typeCol;
+ readonly TreeViewColumn pinCol;
- string errorColor = "red";
- string modifiedColor = "blue";
- string disabledColor = "gray";
+ const string errorColor = "red";
+ const string modifiedColor = "blue";
+ const string disabledColor = "gray";
- static CommandEntrySet menuSet;
+ static readonly CommandEntrySet menuSet;
const int NameCol = 0;
const int ValueCol = 1;
@@ -138,7 +140,7 @@ public ObjectValueTreeView ()
Pango.FontDescription newFont = this.Style.FontDescription.Copy ();
newFont.Size = (newFont.Size * 8) / 10;
- liveIcon = ImageService.GetPixbuf (Gtk.Stock.Execute, IconSize.Menu);
+ liveIcon = ImageService.GetPixbuf (Stock.Execute, IconSize.Menu);
noLiveIcon = ImageService.MakeTransparent (liveIcon, 0.5);
expCol = new TreeViewColumn ();
@@ -161,12 +163,12 @@ public ObjectValueTreeView ()
valueCol = new TreeViewColumn ();
valueCol.Title = GettextCatalog.GetString ("Value");
crpViewer = new CellRendererIcon ();
- crpViewer.IconId = Gtk.Stock.ZoomIn;
+ crpViewer.IconId = Stock.ZoomIn;
valueCol.PackStart (crpViewer, false);
valueCol.AddAttribute (crpViewer, "visible", ViewerButtonVisibleCol);
crpButton = new CellRendererIcon ();
- crpButton.StockSize = (uint)Gtk.IconSize.Menu;
- crpButton.IconId = Gtk.Stock.Refresh;
+ crpButton.StockSize = (uint) IconSize.Menu;
+ crpButton.IconId = Stock.Refresh;
valueCol.PackStart (crpButton, false);
valueCol.AddAttribute (crpButton, "visible", ValueButtonVisibleCol);
crtValue = new CellRendererText ();
@@ -397,16 +399,16 @@ public void LoadState ()
compact = value;
Pango.FontDescription newFont;
if (compact) {
- newFont = this.Style.FontDescription.Copy ();
+ newFont = Style.FontDescription.Copy ();
newFont.Size = (newFont.Size * 8) / 10;
expCol.Sizing = TreeViewColumnSizing.Autosize;
valueCol.Sizing = TreeViewColumnSizing.Autosize;
valueCol.MaxWidth = 800;
- crpButton.Pixbuf = ImageService.GetPixbuf (Gtk.Stock.Refresh).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
- crpViewer.Pixbuf = ImageService.GetPixbuf (Gtk.Stock.ZoomIn).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
+ crpButton.Pixbuf = ImageService.GetPixbuf (Stock.Refresh).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
+ crpViewer.Pixbuf = ImageService.GetPixbuf (Stock.ZoomIn).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
ColumnsAutosize ();
} else {
- newFont = this.Style.FontDescription;
+ newFont = Style.FontDescription;
expCol.Sizing = TreeViewColumnSizing.Fixed;
valueCol.Sizing = TreeViewColumnSizing.Fixed;
valueCol.MaxWidth = int.MaxValue;
@@ -719,7 +721,7 @@ void SetValues (TreeIter parent, TreeIter it, string name, ObjectValue val)
strval = val.Value;
valueColor = disabledColor;
if (val.CanRefresh)
- valueButton = Gtk.Stock.Refresh;
+ valueButton = Stock.Refresh;
canEdit = false;
}
else if (val.IsEvaluating) {
@@ -905,19 +907,19 @@ string GetIterPath (TreeIter iter)
return sb.ToString ();
}
- void OnExpEditing (object s, Gtk.EditingStartedArgs args)
+ void OnExpEditing (object s, EditingStartedArgs args)
{
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- Gtk.Entry e = (Gtk.Entry) args.Editable;
+ Entry e = (Entry) args.Editable;
if (e.Text == createMsg)
e.Text = string.Empty;
OnStartEditing (args);
}
- void OnExpEdited (object s, Gtk.EditedArgs args)
+ void OnExpEdited (object s, EditedArgs args)
{
OnEndEditing ();
@@ -950,13 +952,13 @@ void OnExpEdited (object s, Gtk.EditedArgs args)
bool editing;
- void OnValueEditing (object s, Gtk.EditingStartedArgs args)
+ void OnValueEditing (object s, EditingStartedArgs args)
{
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- var entry = (Gtk.Entry) args.Editable;
+ var entry = (Entry) args.Editable;
ObjectValue val = store.GetValue (it, ObjectCol) as ObjectValue;
string strVal = val != null ? val.Value : null;
@@ -967,14 +969,16 @@ void OnValueEditing (object s, Gtk.EditingStartedArgs args)
OnStartEditing (args);
}
- void OnValueEdited (object s, Gtk.EditedArgs args)
+ void OnValueEdited (object s, EditedArgs args)
{
OnEndEditing ();
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- ObjectValue val = store.GetValue (it, ObjectCol) as ObjectValue;
+
+ ObjectValue val = (ObjectValue) store.GetValue (it, ObjectCol);
+
try {
string newVal = args.NewText;
/* if (newVal == null) {
@@ -986,6 +990,7 @@ void OnValueEdited (object s, Gtk.EditedArgs args)
} catch (Exception ex) {
LoggingService.LogError ("Could not set value for object '" + val.Name + "'", ex);
}
+
store.SetValue (it, ValueCol, val.DisplayValue);
// Update the color
@@ -1008,10 +1013,10 @@ void OnEditingCancelled (object s, EventArgs args)
OnEndEditing ();
}
- void OnStartEditing (Gtk.EditingStartedArgs args)
+ void OnStartEditing (EditingStartedArgs args)
{
editing = true;
- editEntry = (Gtk.Entry) args.Editable;
+ editEntry = (Entry) args.Editable;
editEntry.KeyPressEvent += OnEditKeyPress;
editEntry.KeyReleaseEvent += OnEditKeyRelease;
if (StartEditing != null)
@@ -1048,7 +1053,7 @@ void OnEditKeyRelease (object sender, EventArgs e)
uint keyValue;
[GLib.ConnectBeforeAttribute]
- void OnEditKeyPress (object s, Gtk.KeyPressEventArgs args)
+ void OnEditKeyPress (object s, KeyPressEventArgs args)
{
wasHandled = false;
key = args.Event.Key;
@@ -1069,7 +1074,7 @@ static bool IsCompletionChar (char c)
void PopupCompletion (Entry entry)
{
- Gtk.Application.Invoke (delegate {
+ Application.Invoke (delegate {
char c = (char)Gdk.Keyval.ToUnicode (keyValue);
if (currentCompletionData == null && IsCompletionChar (c)) {
string exp = entry.Text.Substring (0, entry.CursorPosition);
@@ -1297,10 +1302,10 @@ protected void OnCopy ()
return;
if (selected.Length == 1) {
- object focus = IdeApp.Workbench.RootWindow.Focus;
+ var editable = IdeApp.Workbench.RootWindow.Focus as Editable;
- if (focus is Gtk.Editable) {
- ((Gtk.Editable) focus).CopyClipboard ();
+ if (editable != null) {
+ editable.CopyClipboard ();
return;
}
}
@@ -1524,7 +1529,8 @@ public void RemovePinnedWatch (TreeIter it)
protected virtual void OnCompletionContextChanged (EventArgs e)
{
- EventHandler handler = this.CompletionContextChanged;
+ var handler = CompletionContextChanged;
+
if (handler != null)
handler (this, e);
}
@@ -1559,9 +1565,9 @@ char ICompletionWidget.GetChar (int offset)
{
string txt = editEntry.Text;
if (offset >= txt.Length)
- return (char)0;
- else
- return txt [offset];
+ return '\0';
+
+ return txt [offset];
}
CodeCompletionContext ICompletionWidget.CreateCodeCompletionContext (int triggerOffset)
@@ -1711,12 +1717,14 @@ public DebugCompletionDataList (Mono.Debugging.Client.CompletionData data)
get;
set;
}
- static List<ICompletionKeyHandler> keyHandler = new List<ICompletionKeyHandler> ();
+
+ static readonly List<ICompletionKeyHandler> keyHandler = new List<ICompletionKeyHandler> ();
public IEnumerable<ICompletionKeyHandler> KeyHandler { get { return keyHandler;} }
public void OnCompletionListClosed (EventArgs e)
{
- EventHandler handler = this.CompletionListClosed;
+ var handler = CompletionListClosed;
+
if (handler != null)
handler (this, e);
}
@@ -1726,7 +1734,7 @@ public void OnCompletionListClosed (EventArgs e)
class DebugCompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
{
- CompletionItem item;
+ readonly CompletionItem item;
public DebugCompletionData (CompletionItem item)
{
Commit: 2872b361571bae7c42ef92aa182ba061dfc6ad9d
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-07 21:16:21 GMT
URL: https://github.com/mono/monodevelop/commit/2872b361571bae7c42ef92aa182ba061dfc6ad9d
[Debugger] Improved the look of the ExceptionCaughtDialog
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
M main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
M main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
===================================================================
@@ -22,8 +22,8 @@
<Execution>
<Execution clr-version="Net_2_0" />
</Execution>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,8 +36,8 @@
<Execution clr-version="Net_2_0" />
</Execution>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -149,6 +149,7 @@
<Compile Include="MonoDevelop.Debugger\DebuggerConsoleView.cs" />
<Compile Include="MonoDevelop.Debugger.Visualizer\CStringVisualizer.cs" />
<Compile Include="MonoDevelop.Debugger.Visualizer\ValueVisualizer.cs" />
+ <Compile Include="MonoDevelop.Debugger\InfoFrame.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MonoDevelop.Debugger.addin.xml">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
===================================================================
@@ -38,29 +38,34 @@ namespace MonoDevelop.Debugger
{
public partial class ExceptionCaughtWidget : Gtk.Bin
{
- Gtk.TreeStore stackStore;
- ExceptionInfo exception;
+ readonly Gtk.TreeStore stackStore;
+ readonly ExceptionInfo exception;
bool destroyed;
public ExceptionCaughtWidget (ExceptionInfo exception)
{
this.Build ();
+ vboxExceptionInfo.Remove (labelMessage);
+ var frame = new InfoFrame (labelMessage);
+ frame.Show ();
+ vboxExceptionInfo.PackStart (frame, false, true, 0);
+
stackStore = new TreeStore (typeof(string), typeof(string), typeof(int), typeof(int));
treeStack.Model = stackStore;
var crt = new CellRendererText ();
+ crt.Ellipsize = Pango.EllipsizeMode.End;
+ crt.WrapWidth = -1;
treeStack.AppendColumn ("", crt, "markup", 0);
treeStack.ShowExpanders = false;
+ treeStack.RulesHint = true;
valueView.AllowExpanding = true;
valueView.Frame = DebuggingService.CurrentFrame;
this.exception = exception;
exception.Changed += HandleExceptionChanged;
- treeStack.SizeAllocated += delegate(object o, SizeAllocatedArgs args) {
- if (crt.WrapWidth != args.Allocation.Width)
- crt.WrapWidth = args.Allocation.Width;
- };
+ treeStack.SizeAllocated += (object o, SizeAllocatedArgs args) => crt.WrapWidth = args.Allocation.Width;
Fill ();
treeStack.RowActivated += HandleRowActivated;
@@ -68,11 +73,13 @@ public ExceptionCaughtWidget (ExceptionInfo exception)
void HandleRowActivated (object o, RowActivatedArgs args)
{
- Gtk.TreeIter it;
- if (!stackStore.GetIter (out it, args.Path))
+ TreeIter iter;
+
+ if (!stackStore.GetIter (out iter, args.Path))
return;
- string file = (string) stackStore.GetValue (it, 1);
- int line = (int) stackStore.GetValue (it, 2);
+
+ string file = (string) stackStore.GetValue (iter, 1);
+ int line = (int) stackStore.GetValue (iter, 2);
if (!string.IsNullOrEmpty (file))
IdeApp.Workbench.OpenDocument (file, line, 0);
}
@@ -103,6 +110,7 @@ void Fill ()
valueView.AddValue (exception.Instance);
valueView.ExpandRow (new TreePath ("0"), false);
}
+
if (exception.StackIsEvaluating) {
stackStore.AppendValues (GettextCatalog.GetString ("Loading..."), "", 0, 0);
}
@@ -110,11 +118,12 @@ void Fill ()
void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
{
- TreeIter it = TreeIter.Zero;
+ TreeIter iter = TreeIter.Zero;
+
if (showExceptionNode) {
treeStack.ShowExpanders = true;
string tn = exc.Type + ": " + exc.Message;
- it = stackStore.AppendValues (tn, null, 0, 0);
+ iter = stackStore.AppendValues (tn, null, 0, 0);
}
foreach (ExceptionStackFrame frame in exc.StackTrace) {
@@ -129,8 +138,8 @@ void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
text += "</small>";
}
- if (!it.Equals (TreeIter.Zero))
- stackStore.AppendValues (it, text, frame.File, frame.Line, frame.Column);
+ if (!iter.Equals (TreeIter.Zero))
+ stackStore.AppendValues (iter, text, frame.File, frame.Line, frame.Column);
else
stackStore.AppendValues (text, frame.File, frame.Line, frame.Column);
}
@@ -150,9 +159,9 @@ protected override void OnDestroyed ()
class ExceptionCaughtDialog: Gtk.Dialog
{
- ExceptionCaughtWidget widget;
- ExceptionInfo ex;
- ExceptionCaughtMessage msg;
+ readonly ExceptionCaughtWidget widget;
+ readonly ExceptionCaughtMessage msg;
+ readonly ExceptionInfo ex;
public ExceptionCaughtDialog (ExceptionInfo val, ExceptionCaughtMessage msg)
{
@@ -393,7 +402,7 @@ void LoadData ()
class ExceptionCaughtMiniButton: TopLevelWidgetExtension
{
- ExceptionCaughtMessage dlg;
+ readonly ExceptionCaughtMessage dlg;
public ExceptionCaughtMiniButton (ExceptionCaughtMessage dlg, FilePath file, int line)
{
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
===================================================================
@@ -45,7 +45,7 @@
namespace MonoDevelop.Debugger
{
[System.ComponentModel.ToolboxItem (true)]
- public class ObjectValueTreeView: TreeView, ICompletionWidget
+ public class ObjectValueTreeView : TreeView, ICompletionWidget
{
readonly Dictionary<ObjectValue, TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
readonly Dictionary<string, ObjectValue> cachedValues = new Dictionary<string, ObjectValue> ();
Modified: main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
===================================================================
@@ -73,8 +73,6 @@ protected virtual void Build ()
this.hbox2.Add (this.vboxExceptionInfo);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vboxExceptionInfo]));
w4.Position = 1;
- w4.Expand = false;
- w4.Fill = false;
this.vbox2.Add (this.hbox2);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
w5.Position = 0;
Modified: main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
===================================================================
@@ -1820,9 +1820,7 @@ Break when the hit count is a multiple of</property>
</widget>
<packing>
<property name="Position">1</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
+ <property name="AutoSize">False</property>
</packing>
</child>
</widget>
Commit: 4f7ff7868ffdd9d7f93fd9126dcc9bb7f302d827
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-07 21:19:40 GMT
URL: https://github.com/mono/monodevelop/commit/4f7ff7868ffdd9d7f93fd9126dcc9bb7f302d827
[Debugger] Oops, forgot to add a file
Added paths:
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
===================================================================
@@ -0,0 +1,57 @@
+//
+// InfoFrame.cs
+//
+// Author:
+// Jeffrey Stedfast <[email protected]>
+//
+// Copyright (c) 2013 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+using Gtk;
+
+namespace MonoDevelop.Debugger
+{
+ [System.ComponentModel.ToolboxItem (true)]
+ class InfoFrame : Gtk.Frame
+ {
+ public InfoFrame ()
+ {
+ Shadow = ShadowType.EtchedIn;
+ }
+
+ public InfoFrame (Widget child) : this ()
+ {
+ Child = child;
+ }
+
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+ {
+ using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) {
+ cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
+ cr.SetSourceRGB (1.0, 0.98, 0.91);
+ cr.Fill ();
+ }
+
+ return base.OnExposeEvent (evnt);
+ }
+ }
+}
Commit: b2994fb297e5b72e6c52c5844c89e153f2420839
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-07 21:20:02 GMT
URL: https://github.com/mono/monodevelop/commit/b2994fb297e5b72e6c52c5844c89e153f2420839
[Debugger] sprinkled some magic readonly dust
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
===================================================================
@@ -215,10 +215,10 @@ void HandleCopyClicked (object sender, EventArgs e)
class ExceptionCaughtMessage : IDisposable
{
- ExceptionInfo ex;
+ ExceptionCaughtMiniButton miniButton;
ExceptionCaughtDialog dialog;
ExceptionCaughtButton button;
- ExceptionCaughtMiniButton miniButton;
+ readonly ExceptionInfo ex;
public ExceptionCaughtMessage (ExceptionInfo val, FilePath file, int line, int col)
{
@@ -308,11 +308,11 @@ public void Close ()
class ExceptionCaughtButton: TopLevelWidgetExtension
{
- ExceptionCaughtMessage dlg;
- ExceptionInfo exception;
+ readonly Gdk.Pixbuf closeSelOverImage;
+ readonly Gdk.Pixbuf closeSelImage;
+ readonly ExceptionCaughtMessage dlg;
+ readonly ExceptionInfo exception;
Gtk.Label messageLabel;
- Gdk.Pixbuf closeSelImage;
- Gdk.Pixbuf closeSelOverImage;
public ExceptionCaughtButton (ExceptionInfo val, ExceptionCaughtMessage dlg, FilePath file, int line)
{
Commit: 1cc997ebd36624bcf21864e2deb73967cc795e81
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-07 21:33:06 GMT
URL: https://github.com/mono/monodevelop/commit/1cc997ebd36624bcf21864e2deb73967cc795e81
[Core] Include external MonoDoc directory on Windows
BXC7813 - Does not show API documentation
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
===================================================================
@@ -78,6 +78,13 @@ static void InitializeHelpTree ()
foreach (var node in AddinManager.GetExtensionNodes ("/MonoDevelop/ProjectModel/MonoDocSources"))
sources.Add (((MonoDocSourceNode)node).Directory);
+
+ if (Platform.IsWindows) {
+ // windoc defines a special external directory used by XA. we need to read these docs too.
+ // Not sure why it wasn't defined in monodoc.dll
+ var commonAppData = Environment.GetFolderPath (Environment.SpecialFolder.CommonApplicationData);
+ sources.Add (Path.Combine (commonAppData, "Monodoc"));
+ }
//remove nonexistent sources
foreach (var s in sources.ToList ().Where (d => !Directory.Exists (d)))
Commit: 4ad78b6bb39976da41afc6d2784a148c160d6793
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-07 21:33:39 GMT
URL: https://github.com/mono/monodevelop/commit/4ad78b6bb39976da41afc6d2784a148c160d6793
Merge branch 'master' of github.com:mono/monodevelop
Changed paths:
M main/external/xwt
M main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs
M main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataType.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
M main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
M main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
M version-checks
Added paths:
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit dfc729dd856d1cceff7853a2648468d4f68d044e
+Subproject commit 4ba97a9b9735565e706c03c5755a648d997a52c6
Modified: main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs
===================================================================
@@ -83,6 +83,12 @@ internal MetadataPropertyInfo (IMetadataImport importer, int propertyToken, Meta
m_propAttributes = (PropertyAttributes) pdwPropFlags;
m_name = szProperty.ToString ();
MetadataHelperFunctions.GetCustomAttribute (importer, propertyToken, typeof (System.Diagnostics.DebuggerBrowsableAttribute));
+
+ if (!m_importer.IsValidToken ((uint)m_pmdGetter))
+ m_pmdGetter = 0;
+
+ if (!m_importer.IsValidToken ((uint)m_pmdSetter))
+ m_pmdSetter = 0;
}
public override PropertyAttributes Attributes
@@ -107,11 +113,15 @@ public override MethodInfo[] GetAccessors (bool nonPublic)
public override MethodInfo GetGetMethod (bool nonPublic)
{
- if (m_getter == null) {
- if (m_pmdGetter != 0)
- m_getter = new MetadataMethodInfo (m_importer, m_pmdGetter);
- }
- return m_getter;
+ if (m_pmdGetter == 0)
+ return null;
+
+ if (m_getter == null)
+ m_getter = new MetadataMethodInfo (m_importer, m_pmdGetter);
+
+ if (nonPublic || m_getter.IsPublic)
+ return m_getter;
+ return null;
}
public override ParameterInfo[] GetIndexParameters ( )
@@ -124,11 +134,15 @@ public override ParameterInfo[] GetIndexParameters ( )
public override MethodInfo GetSetMethod (bool nonPublic)
{
- if (m_setter == null) {
- if (m_pmdSetter != 0)
- m_setter = new MetadataMethodInfo (m_importer, m_pmdSetter);
- }
- return m_setter;
+ if (m_pmdSetter == 0)
+ return null;
+
+ if (m_setter == null)
+ m_setter = new MetadataMethodInfo (m_importer, m_pmdSetter);
+
+ if (nonPublic || m_setter.IsPublic)
+ return m_setter;
+ return null;
}
public override object GetValue (object obj, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture)
Modified: main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataType.cs
===================================================================
@@ -423,9 +423,9 @@ public override PropertyInfo[] GetProperties(BindingFlags bindingAttr)
break;
MetadataPropertyInfo prop = new MetadataPropertyInfo (m_importer, methodToken, this);
try {
- MethodInfo mi = prop.GetGetMethod ();
+ MethodInfo mi = prop.GetGetMethod () ?? prop.GetSetMethod ();
if (mi == null)
- mi = prop.GetSetMethod ();
+ continue;
if (FlagsMatch (mi.IsPublic, mi.IsStatic, bindingAttr))
al.Add (prop);
}
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
===================================================================
@@ -22,8 +22,8 @@
<Execution>
<Execution clr-version="Net_2_0" />
</Execution>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,8 +36,8 @@
<Execution clr-version="Net_2_0" />
</Execution>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -149,6 +149,7 @@
<Compile Include="MonoDevelop.Debugger\DebuggerConsoleView.cs" />
<Compile Include="MonoDevelop.Debugger.Visualizer\CStringVisualizer.cs" />
<Compile Include="MonoDevelop.Debugger.Visualizer\ValueVisualizer.cs" />
+ <Compile Include="MonoDevelop.Debugger\InfoFrame.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MonoDevelop.Debugger.addin.xml">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
===================================================================
@@ -38,29 +38,34 @@ namespace MonoDevelop.Debugger
{
public partial class ExceptionCaughtWidget : Gtk.Bin
{
- Gtk.TreeStore stackStore;
- ExceptionInfo exception;
+ readonly Gtk.TreeStore stackStore;
+ readonly ExceptionInfo exception;
bool destroyed;
public ExceptionCaughtWidget (ExceptionInfo exception)
{
this.Build ();
+ vboxExceptionInfo.Remove (labelMessage);
+ var frame = new InfoFrame (labelMessage);
+ frame.Show ();
+ vboxExceptionInfo.PackStart (frame, false, true, 0);
+
stackStore = new TreeStore (typeof(string), typeof(string), typeof(int), typeof(int));
treeStack.Model = stackStore;
var crt = new CellRendererText ();
+ crt.Ellipsize = Pango.EllipsizeMode.End;
+ crt.WrapWidth = -1;
treeStack.AppendColumn ("", crt, "markup", 0);
treeStack.ShowExpanders = false;
+ treeStack.RulesHint = true;
valueView.AllowExpanding = true;
valueView.Frame = DebuggingService.CurrentFrame;
this.exception = exception;
exception.Changed += HandleExceptionChanged;
- treeStack.SizeAllocated += delegate(object o, SizeAllocatedArgs args) {
- if (crt.WrapWidth != args.Allocation.Width)
- crt.WrapWidth = args.Allocation.Width;
- };
+ treeStack.SizeAllocated += (object o, SizeAllocatedArgs args) => crt.WrapWidth = args.Allocation.Width;
Fill ();
treeStack.RowActivated += HandleRowActivated;
@@ -68,11 +73,13 @@ public ExceptionCaughtWidget (ExceptionInfo exception)
void HandleRowActivated (object o, RowActivatedArgs args)
{
- Gtk.TreeIter it;
- if (!stackStore.GetIter (out it, args.Path))
+ TreeIter iter;
+
+ if (!stackStore.GetIter (out iter, args.Path))
return;
- string file = (string) stackStore.GetValue (it, 1);
- int line = (int) stackStore.GetValue (it, 2);
+
+ string file = (string) stackStore.GetValue (iter, 1);
+ int line = (int) stackStore.GetValue (iter, 2);
if (!string.IsNullOrEmpty (file))
IdeApp.Workbench.OpenDocument (file, line, 0);
}
@@ -103,6 +110,7 @@ void Fill ()
valueView.AddValue (exception.Instance);
valueView.ExpandRow (new TreePath ("0"), false);
}
+
if (exception.StackIsEvaluating) {
stackStore.AppendValues (GettextCatalog.GetString ("Loading..."), "", 0, 0);
}
@@ -110,11 +118,12 @@ void Fill ()
void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
{
- TreeIter it = TreeIter.Zero;
+ TreeIter iter = TreeIter.Zero;
+
if (showExceptionNode) {
treeStack.ShowExpanders = true;
string tn = exc.Type + ": " + exc.Message;
- it = stackStore.AppendValues (tn, null, 0, 0);
+ iter = stackStore.AppendValues (tn, null, 0, 0);
}
foreach (ExceptionStackFrame frame in exc.StackTrace) {
@@ -129,8 +138,8 @@ void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
text += "</small>";
}
- if (!it.Equals (TreeIter.Zero))
- stackStore.AppendValues (it, text, frame.File, frame.Line, frame.Column);
+ if (!iter.Equals (TreeIter.Zero))
+ stackStore.AppendValues (iter, text, frame.File, frame.Line, frame.Column);
else
stackStore.AppendValues (text, frame.File, frame.Line, frame.Column);
}
@@ -150,9 +159,9 @@ protected override void OnDestroyed ()
class ExceptionCaughtDialog: Gtk.Dialog
{
- ExceptionCaughtWidget widget;
- ExceptionInfo ex;
- ExceptionCaughtMessage msg;
+ readonly ExceptionCaughtWidget widget;
+ readonly ExceptionCaughtMessage msg;
+ readonly ExceptionInfo ex;
public ExceptionCaughtDialog (ExceptionInfo val, ExceptionCaughtMessage msg)
{
@@ -206,10 +215,10 @@ void HandleCopyClicked (object sender, EventArgs e)
class ExceptionCaughtMessage : IDisposable
{
- ExceptionInfo ex;
+ ExceptionCaughtMiniButton miniButton;
ExceptionCaughtDialog dialog;
ExceptionCaughtButton button;
- ExceptionCaughtMiniButton miniButton;
+ readonly ExceptionInfo ex;
public ExceptionCaughtMessage (ExceptionInfo val, FilePath file, int line, int col)
{
@@ -299,11 +308,11 @@ public void Close ()
class ExceptionCaughtButton: TopLevelWidgetExtension
{
- ExceptionCaughtMessage dlg;
- ExceptionInfo exception;
+ readonly Gdk.Pixbuf closeSelOverImage;
+ readonly Gdk.Pixbuf closeSelImage;
+ readonly ExceptionCaughtMessage dlg;
+ readonly ExceptionInfo exception;
Gtk.Label messageLabel;
- Gdk.Pixbuf closeSelImage;
- Gdk.Pixbuf closeSelOverImage;
public ExceptionCaughtButton (ExceptionInfo val, ExceptionCaughtMessage dlg, FilePath file, int line)
{
@@ -393,7 +402,7 @@ void LoadData ()
class ExceptionCaughtMiniButton: TopLevelWidgetExtension
{
- ExceptionCaughtMessage dlg;
+ readonly ExceptionCaughtMessage dlg;
public ExceptionCaughtMiniButton (ExceptionCaughtMessage dlg, FilePath file, int line)
{
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
===================================================================
@@ -0,0 +1,57 @@
+//
+// InfoFrame.cs
+//
+// Author:
+// Jeffrey Stedfast <[email protected]>
+//
+// Copyright (c) 2013 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+using Gtk;
+
+namespace MonoDevelop.Debugger
+{
+ [System.ComponentModel.ToolboxItem (true)]
+ class InfoFrame : Gtk.Frame
+ {
+ public InfoFrame ()
+ {
+ Shadow = ShadowType.EtchedIn;
+ }
+
+ public InfoFrame (Widget child) : this ()
+ {
+ Child = child;
+ }
+
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+ {
+ using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) {
+ cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
+ cr.SetSourceRGB (1.0, 0.98, 0.91);
+ cr.Fill ();
+ }
+
+ return base.OnExposeEvent (evnt);
+ }
+ }
+}
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
===================================================================
@@ -45,23 +45,25 @@
namespace MonoDevelop.Debugger
{
[System.ComponentModel.ToolboxItem (true)]
- public class ObjectValueTreeView: Gtk.TreeView, ICompletionWidget
+ public class ObjectValueTreeView : TreeView, ICompletionWidget
{
- List<string> valueNames = new List<string> ();
- Dictionary<string,string> oldValues = new Dictionary<string,string> ();
- List<ObjectValue> values = new List<ObjectValue> ();
- Dictionary<ObjectValue,TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
- Dictionary<string,ObjectValue> cachedValues = new Dictionary<string,ObjectValue> ();
- Dictionary<ObjectValue, Task> expandTasks = new Dictionary<ObjectValue, Task> ();
- TreeStore store;
- TreeViewState state;
- string createMsg;
+ readonly Dictionary<ObjectValue, TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
+ readonly Dictionary<string, ObjectValue> cachedValues = new Dictionary<string, ObjectValue> ();
+ readonly Dictionary<ObjectValue, Task> expandTasks = new Dictionary<ObjectValue, Task> ();
+ readonly Dictionary<string, string> oldValues = new Dictionary<string, string> ();
+ readonly List<ObjectValue> values = new List<ObjectValue> ();
+ readonly List<string> valueNames = new List<string> ();
+
+ readonly Gdk.Pixbuf noLiveIcon;
+ readonly Gdk.Pixbuf liveIcon;
+
+ readonly TreeViewState state;
+ readonly TreeStore store;
+ readonly string createMsg;
bool restoringState = false;
bool compact;
StackFrame frame;
bool disposed;
- Gdk.Pixbuf noLiveIcon;
- Gdk.Pixbuf liveIcon;
bool columnsAdjusted;
bool columnSizesUpdating;
@@ -70,26 +72,26 @@ public class ObjectValueTreeView: Gtk.TreeView, ICompletionWidget
double valueColWidth;
double typeColWidth;
- CellRendererText crtExp;
- CellRendererText crtValue;
- CellRendererText crtType;
- CellRendererIcon crpButton;
- CellRendererIcon crpPin;
- CellRendererIcon crpLiveUpdate;
- CellRendererIcon crpViewer;
- Gtk.Entry editEntry;
+ readonly CellRendererText crtExp;
+ readonly CellRendererText crtValue;
+ readonly CellRendererText crtType;
+ readonly CellRendererIcon crpButton;
+ readonly CellRendererIcon crpPin;
+ readonly CellRendererIcon crpLiveUpdate;
+ readonly CellRendererIcon crpViewer;
+ Entry editEntry;
Mono.Debugging.Client.CompletionData currentCompletionData;
- TreeViewColumn expCol;
- TreeViewColumn valueCol;
- TreeViewColumn typeCol;
- TreeViewColumn pinCol;
+ readonly TreeViewColumn expCol;
+ readonly TreeViewColumn valueCol;
+ readonly TreeViewColumn typeCol;
+ readonly TreeViewColumn pinCol;
- string errorColor = "red";
- string modifiedColor = "blue";
- string disabledColor = "gray";
+ const string errorColor = "red";
+ const string modifiedColor = "blue";
+ const string disabledColor = "gray";
- static CommandEntrySet menuSet;
+ static readonly CommandEntrySet menuSet;
const int NameCol = 0;
const int ValueCol = 1;
@@ -138,7 +140,7 @@ public ObjectValueTreeView ()
Pango.FontDescription newFont = this.Style.FontDescription.Copy ();
newFont.Size = (newFont.Size * 8) / 10;
- liveIcon = ImageService.GetPixbuf (Gtk.Stock.Execute, IconSize.Menu);
+ liveIcon = ImageService.GetPixbuf (Stock.Execute, IconSize.Menu);
noLiveIcon = ImageService.MakeTransparent (liveIcon, 0.5);
expCol = new TreeViewColumn ();
@@ -161,12 +163,12 @@ public ObjectValueTreeView ()
valueCol = new TreeViewColumn ();
valueCol.Title = GettextCatalog.GetString ("Value");
crpViewer = new CellRendererIcon ();
- crpViewer.IconId = Gtk.Stock.ZoomIn;
+ crpViewer.IconId = Stock.ZoomIn;
valueCol.PackStart (crpViewer, false);
valueCol.AddAttribute (crpViewer, "visible", ViewerButtonVisibleCol);
crpButton = new CellRendererIcon ();
- crpButton.StockSize = (uint)Gtk.IconSize.Menu;
- crpButton.IconId = Gtk.Stock.Refresh;
+ crpButton.StockSize = (uint) IconSize.Menu;
+ crpButton.IconId = Stock.Refresh;
valueCol.PackStart (crpButton, false);
valueCol.AddAttribute (crpButton, "visible", ValueButtonVisibleCol);
crtValue = new CellRendererText ();
@@ -397,16 +399,16 @@ public void LoadState ()
compact = value;
Pango.FontDescription newFont;
if (compact) {
- newFont = this.Style.FontDescription.Copy ();
+ newFont = Style.FontDescription.Copy ();
newFont.Size = (newFont.Size * 8) / 10;
expCol.Sizing = TreeViewColumnSizing.Autosize;
valueCol.Sizing = TreeViewColumnSizing.Autosize;
valueCol.MaxWidth = 800;
- crpButton.Pixbuf = ImageService.GetPixbuf (Gtk.Stock.Refresh).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
- crpViewer.Pixbuf = ImageService.GetPixbuf (Gtk.Stock.ZoomIn).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
+ crpButton.Pixbuf = ImageService.GetPixbuf (Stock.Refresh).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
+ crpViewer.Pixbuf = ImageService.GetPixbuf (Stock.ZoomIn).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
ColumnsAutosize ();
} else {
- newFont = this.Style.FontDescription;
+ newFont = Style.FontDescription;
expCol.Sizing = TreeViewColumnSizing.Fixed;
valueCol.Sizing = TreeViewColumnSizing.Fixed;
valueCol.MaxWidth = int.MaxValue;
@@ -719,7 +721,7 @@ void SetValues (TreeIter parent, TreeIter it, string name, ObjectValue val)
strval = val.Value;
valueColor = disabledColor;
if (val.CanRefresh)
- valueButton = Gtk.Stock.Refresh;
+ valueButton = Stock.Refresh;
canEdit = false;
}
else if (val.IsEvaluating) {
@@ -905,19 +907,19 @@ string GetIterPath (TreeIter iter)
return sb.ToString ();
}
- void OnExpEditing (object s, Gtk.EditingStartedArgs args)
+ void OnExpEditing (object s, EditingStartedArgs args)
{
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- Gtk.Entry e = (Gtk.Entry) args.Editable;
+ Entry e = (Entry) args.Editable;
if (e.Text == createMsg)
e.Text = string.Empty;
OnStartEditing (args);
}
- void OnExpEdited (object s, Gtk.EditedArgs args)
+ void OnExpEdited (object s, EditedArgs args)
{
OnEndEditing ();
@@ -950,13 +952,13 @@ void OnExpEdited (object s, Gtk.EditedArgs args)
bool editing;
- void OnValueEditing (object s, Gtk.EditingStartedArgs args)
+ void OnValueEditing (object s, EditingStartedArgs args)
{
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- var entry = (Gtk.Entry) args.Editable;
+ var entry = (Entry) args.Editable;
ObjectValue val = store.GetValue (it, ObjectCol) as ObjectValue;
string strVal = val != null ? val.Value : null;
@@ -967,14 +969,16 @@ void OnValueEditing (object s, Gtk.EditingStartedArgs args)
OnStartEditing (args);
}
- void OnValueEdited (object s, Gtk.EditedArgs args)
+ void OnValueEdited (object s, EditedArgs args)
{
OnEndEditing ();
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- ObjectValue val = store.GetValue (it, ObjectCol) as ObjectValue;
+
+ ObjectValue val = (ObjectValue) store.GetValue (it, ObjectCol);
+
try {
string newVal = args.NewText;
/* if (newVal == null) {
@@ -986,6 +990,7 @@ void OnValueEdited (object s, Gtk.EditedArgs args)
} catch (Exception ex) {
LoggingService.LogError ("Could not set value for object '" + val.Name + "'", ex);
}
+
store.SetValue (it, ValueCol, val.DisplayValue);
// Update the color
@@ -1008,10 +1013,10 @@ void OnEditingCancelled (object s, EventArgs args)
OnEndEditing ();
}
- void OnStartEditing (Gtk.EditingStartedArgs args)
+ void OnStartEditing (EditingStartedArgs args)
{
editing = true;
- editEntry = (Gtk.Entry) args.Editable;
+ editEntry = (Entry) args.Editable;
editEntry.KeyPressEvent += OnEditKeyPress;
editEntry.KeyReleaseEvent += OnEditKeyRelease;
if (StartEditing != null)
@@ -1048,7 +1053,7 @@ void OnEditKeyRelease (object sender, EventArgs e)
uint keyValue;
[GLib.ConnectBeforeAttribute]
- void OnEditKeyPress (object s, Gtk.KeyPressEventArgs args)
+ void OnEditKeyPress (object s, KeyPressEventArgs args)
{
wasHandled = false;
key = args.Event.Key;
@@ -1069,7 +1074,7 @@ static bool IsCompletionChar (char c)
void PopupCompletion (Entry entry)
{
- Gtk.Application.Invoke (delegate {
+ Application.Invoke (delegate {
char c = (char)Gdk.Keyval.ToUnicode (keyValue);
if (currentCompletionData == null && IsCompletionChar (c)) {
string exp = entry.Text.Substring (0, entry.CursorPosition);
@@ -1297,10 +1302,10 @@ protected void OnCopy ()
return;
if (selected.Length == 1) {
- object focus = IdeApp.Workbench.RootWindow.Focus;
+ var editable = IdeApp.Workbench.RootWindow.Focus as Editable;
- if (focus is Gtk.Editable) {
- ((Gtk.Editable) focus).CopyClipboard ();
+ if (editable != null) {
+ editable.CopyClipboard ();
return;
}
}
@@ -1524,7 +1529,8 @@ public void RemovePinnedWatch (TreeIter it)
protected virtual void OnCompletionContextChanged (EventArgs e)
{
- EventHandler handler = this.CompletionContextChanged;
+ var handler = CompletionContextChanged;
+
if (handler != null)
handler (this, e);
}
@@ -1559,9 +1565,9 @@ char ICompletionWidget.GetChar (int offset)
{
string txt = editEntry.Text;
if (offset >= txt.Length)
- return (char)0;
- else
- return txt [offset];
+ return '\0';
+
+ return txt [offset];
}
CodeCompletionContext ICompletionWidget.CreateCodeCompletionContext (int triggerOffset)
@@ -1711,12 +1717,14 @@ public DebugCompletionDataList (Mono.Debugging.Client.CompletionData data)
get;
set;
}
- static List<ICompletionKeyHandler> keyHandler = new List<ICompletionKeyHandler> ();
+
+ static readonly List<ICompletionKeyHandler> keyHandler = new List<ICompletionKeyHandler> ();
public IEnumerable<ICompletionKeyHandler> KeyHandler { get { return keyHandler;} }
public void OnCompletionListClosed (EventArgs e)
{
- EventHandler handler = this.CompletionListClosed;
+ var handler = CompletionListClosed;
+
if (handler != null)
handler (this, e);
}
@@ -1726,7 +1734,7 @@ public void OnCompletionListClosed (EventArgs e)
class DebugCompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
{
- CompletionItem item;
+ readonly CompletionItem item;
public DebugCompletionData (CompletionItem item)
{
Modified: main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
===================================================================
@@ -73,8 +73,6 @@ protected virtual void Build ()
this.hbox2.Add (this.vboxExceptionInfo);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vboxExceptionInfo]));
w4.Position = 1;
- w4.Expand = false;
- w4.Fill = false;
this.vbox2.Add (this.hbox2);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
w5.Position = 0;
Modified: main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
===================================================================
@@ -1820,9 +1820,7 @@ Break when the hit count is a multiple of</property>
</widget>
<packing>
<property name="Position">1</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
+ <property name="AutoSize">False</property>
</packing>
</child>
</widget>
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
===================================================================
@@ -397,12 +397,12 @@ internal bool ResolveParent ()
}
#endregion
+ // FIXME: rename this to LogicalName for a better mapping to the MSBuild property
public string ResourceId {
get {
- if (BuildAction != MonoDevelop.Projects.BuildAction.EmbeddedResource)
- return string.Empty;
- if (string.IsNullOrEmpty (resourceId) && project is DotNetProject)
+ if (BuildAction == MonoDevelop.Projects.BuildAction.EmbeddedResource && string.IsNullOrEmpty (resourceId) && project is DotNetProject)
return ((DotNetProject)project).ResourceHandler.GetDefaultResourceId (this);
+
return resourceId;
}
set {
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=a7ce288830ba36dcb13147d908f214500665b5c0
+DEP_NEEDED_VERSION[0]=3d230f0a822fb49b50a280d108878bd91335b338
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 07019e10404ed00d3bd2860ba3e3a0fb79ac10b4
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-07 22:12:17 GMT
URL: https://github.com/mono/monodevelop/commit/07019e10404ed00d3bd2860ba3e3a0fb79ac10b4
[MacPlatform] Instead of throwing exceptions on unknown keychain errors, just return null
Fixes bug #16017
Changed paths:
M main/src/addins/MacPlatform/MacInterop/Keychain.cs
Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -528,11 +528,8 @@ static unsafe string GetUsernameFromKeychainItemRef (IntPtr itemRef)
0, null, (uint) path.Length, path, (ushort) uri.Port,
protocol, auth, out passwordLength, out passwordData, ref item);
- if (result == OSStatus.ItemNotFound)
- return null;
-
if (result != OSStatus.Ok)
- throw new Exception ("Could not find internet username and password: " + GetError (result));
+ return null;
var username = GetUsernameFromKeychainItemRef (item);
@@ -564,11 +561,8 @@ public static string FindInternetPassword (Uri uri)
CFRelease (item);
- if (result == OSStatus.ItemNotFound)
- return null;
-
if (result != OSStatus.Ok)
- throw new Exception ("Could not find internet password: " + GetError (result));
+ return null;
return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
}
Commit: 917c182933d2d722cd10e1e8ff3ebf3e5c440bf7
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-08 00:28:45 GMT
URL: https://github.com/mono/monodevelop/commit/917c182933d2d722cd10e1e8ff3ebf3e5c440bf7
Bump xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 4ba97a9b9735565e706c03c5755a648d997a52c6
+Subproject commit 4894929736f80101fd56c31b2b076fa7765d2057
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=3d230f0a822fb49b50a280d108878bd91335b338
+DEP_NEEDED_VERSION[0]=9afde49791dc3aee4f732aecbbebf4fa3fea8616
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: ce856e4d345cd720b6cd88c3d663de16648f58b7
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-08 01:45:13 GMT
URL: https://github.com/mono/monodevelop/commit/ce856e4d345cd720b6cd88c3d663de16648f58b7
[CBinding] BXC15898 - Build fails if solution contains multiple platforms
Changed paths:
M main/src/addins/CBinding/Compiler/GNUCompiler.cs
Modified: main/src/addins/CBinding/Compiler/GNUCompiler.cs
===================================================================
@@ -83,9 +83,9 @@ public abstract class GNUCompiler : CCompiler
string outputName = Path.Combine (configuration.OutputDirectory,
configuration.CompiledOutputName);
- // Precompile header files and place them in .prec/<config_name>/
+ // Precompile header files and place them in prec/<config_name>/
if (configuration.PrecompileHeaders) {
- string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
string precConfigDir = Path.Combine (precDir, configuration.Id);
if (!Directory.Exists (precDir))
Directory.CreateDirectory (precDir);
@@ -188,7 +188,7 @@ public override string GetCompilerFlags (Project project, CProjectConfiguration
args.Append ("-I\"" + StringParserService.Parse (inc, GetStringTags (project)) + "\" ");
if (configuration.PrecompileHeaders) {
- string precdir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precdir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
precdir = Path.Combine (precdir, configuration.Id);
args.Append ("-I\"" + precdir + "\"");
}
@@ -279,7 +279,7 @@ private string[] DependedOnFiles (ProjectFile file, CProjectConfiguration config
foreach (ProjectFile file in projectFiles) {
if (file.Subtype == Subtype.Code && CProject.IsHeaderFile (file.Name)) {
- string precomp = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precomp = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
precomp = Path.Combine (precomp, configuration.Id);
precomp = Path.Combine (precomp, Path.GetFileName (file.Name) + ".ghc");
if (file.BuildAction == BuildAction.Compile) {
@@ -623,10 +623,10 @@ public override void Clean (ProjectFileCollection projectFiles, CProjectConfigur
void CleanPrecompiledHeaders (CProjectConfiguration configuration)
{
- if (string.IsNullOrEmpty (configuration.SourceDirectory))
+ if (string.IsNullOrEmpty (configuration.IntermediateOutputDirectory))
return;
- string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
if (Directory.Exists (precDir))
Directory.Delete (precDir, true);
Commit: 1abde388e086f67712be280db372c4aa7595aa72
Author: Xamarin Release Manager <[email protected]> (xamarin-release-manager)
Committer: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-08 03:17:09 GMT
URL: https://github.com/mono/monodevelop/commit/1abde388e086f67712be280db372c4aa7595aa72
Updated package version to 4.2
Changed paths:
M extras/AspNetEdit/configure
M extras/BooBinding/configure
M extras/GeckoWebBrowser/configure
M extras/JavaBinding/configure
M extras/MonoDevelop.AddinAuthoring/configure
M extras/MonoDevelop.Database/configure.in
M extras/MonoDevelop.Debugger.Gdb/configure
M extras/MonoDevelop.Debugger.Mdb/configure
M extras/MonoDevelop.MeeGo/configure
M extras/MonoDevelop.Profiling/configure.in
M extras/PyBinding/configure
M extras/ValaBinding/configure.in
M extras/WebKitWebBrowser/configure
M main/configure.in
M main/src/core/MonoDevelop.Core/BuildVariables.cs
Modified: extras/AspNetEdit/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=aspnetedit
prefix=/usr/local
config=DEBUG
Modified: extras/BooBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/bin/bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-boo
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
+common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
usage ()
Modified: extras/GeckoWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=geckowebbrowser
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.1.13"
+common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.2"
usage ()
Modified: extras/JavaBinding/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-java
prefix=/usr/local
config=DEBUG
Modified: extras/MonoDevelop.AddinAuthoring/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop_addinauthoring
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
+common_packages=" monodevelop;4.2 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
usage ()
Modified: extras/MonoDevelop.Database/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-database], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-database], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.4
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
GTKSHARP_REQUIRED_VERSION=2.12.8
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/MonoDevelop.Debugger.Gdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-debugger-gdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13"
+common_packages=" monodevelop;4.2"
usage ()
Modified: extras/MonoDevelop.Debugger.Mdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-debugger-mdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
Modified: extras/MonoDevelop.MeeGo/configure
===================================================================
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
prefix=/usr/local
-common_packages=" mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
{
Modified: extras/MonoDevelop.Profiling/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-profiling], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-profiling], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
@@ -42,7 +42,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
GTKSHARP_REQUIRED_VERSION=2.12.8
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/PyBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-python
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
Modified: extras/ValaBinding/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-vala], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-vala], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE(1.9 tar-ustar)
AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
LIBVALA_REQUIRED_VERSION=0.12.0
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/WebKitWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=webkitwebbrowser
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 webkit-sharp-1.0;0.2"
+common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.2 webkit-sharp-1.0;0.2"
usage ()
Modified: main/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 4.1.13, [[email protected]])
+AC_INIT([monodevelop], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.10 tar-ustar])
AM_MAINTAINER_MODE
@@ -12,7 +12,7 @@ ASSEMBLY_VERSION=4.0.0.0
# the C# side of things. It should be one of the following two formats:
# 1) "VERSION_NUMBER" "2.0"
# 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER" "2.0 Alpha 1"
-PACKAGE_VERSION_LABEL="4.1.13"
+PACKAGE_VERSION_LABEL="4.2"
COMPAT_ADDIN_VERSION=4.0
Modified: main/src/core/MonoDevelop.Core/BuildVariables.cs
===================================================================
@@ -2,8 +2,8 @@ namespace MonoDevelop
{
public static class BuildInfo
{
- public const string Version = "4.1.13";
- public const string VersionLabel = "4.1.13";
+ public const string Version = "4.2";
+ public const string VersionLabel = "4.2";
public const string CompatVersion = "4.0";
}
}
Commit: d30dbc9159b89af1159ef6c9a264ccd9ad0da368
Author: Xamarin Release Manager <[email protected]> (xamarin-release-manager)
Committer: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-08 05:51:07 GMT
URL: https://github.com/mono/monodevelop/commit/d30dbc9159b89af1159ef6c9a264ccd9ad0da368
Updated add-ins version to 4.2
Changed paths:
M extras/AspNetEdit/AspNetEdit.addin.xml
M extras/BooBinding/BooBinding.addin.xml
M extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
M extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
M extras/JavaBinding/JavaBinding.addin.xml
M extras/LuaBinding/LuaBinding.addin.xml
M extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
M extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
M extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
M extras/NemerleBinding/NemerleBinding.addin.xml
M extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
M extras/PyBinding/PyBinding/PyBinding.addin.xml
M extras/ValaBinding/ValaBinding.addin.xml
M extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
M main/src/addins/CBinding/CBinding.addin.xml
M main/src/addins/CSharpBinding/CSharpBinding.addin.xml
M main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
M main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
M main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
M main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
M main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
M main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
M main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
M main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
M main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
M main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
M main/src/addins/VBNetBinding/VBNetBinding.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
M main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
M main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
M main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
Modified: extras/AspNetEdit/AspNetEdit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Visual Designer for ASP.NET Web Forms."
category = "Web Development"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "AspNetEdit.dll"/>
@@ -14,11 +14,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13" />
- <Addin id="AspNet" version="4.1.13" />
- <Addin id="DesignerSupport" version="4.1.13" />
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Deployment" version="4.2" />
+ <Addin id="AspNet" version="4.2" />
+ <Addin id="DesignerSupport" version="4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/DisplayBindings">
Modified: extras/BooBinding/BooBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://boo.codehaus.org"
description = "Boo Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "BooBinding.dll"/>
@@ -16,8 +16,8 @@
<Localizer type="Gettext" catalog="monodevelop-boo"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
<Assembly name="Boo.Lang.Compiler, Version=1.0.0.0" package="Boo" />
</Dependencies>
Modified: extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
url = "http://www.monodevelop.com"
description = "Mozilla Web Browser component using GeckoSharp and GtkMozEmbed"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = ""
description = "Provides a text editor for the MonoDevelop IDE based on GtkSourceView 2"
category = "MonoDevelop Core"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.SourceEditor.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<!-- Extension points -->
Modified: extras/JavaBinding/JavaBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Java Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
<Localizer type="Gettext" catalog="monodevelop-java"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/LuaBinding/LuaBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Lua Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "LuaBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
===================================================================
@@ -5,12 +5,12 @@
copyright = "MIT X11"
url = "http://www.monodevelop.com"
description = "This add-in provides utilities for creating Mono.Addins based libraries and applications"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
<!-- Extension Points -->
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.CodeAnalysis.dll"/>
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.CodeAnalysis.dll"/>
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
===================================================================
@@ -6,11 +6,11 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Ide/Commands">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database CodeGenerator Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Query" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Query" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Components Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Components.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database ConnectionManager Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Query" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Query" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Pads">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Designer Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Designer.dll"/>
@@ -15,9 +15,9 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
</Dependencies>
</Addin>
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Query Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Query.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Database/ToolBar/SqlQueryView">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/>
@@ -15,7 +15,7 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.2"/>
</Dependencies>
<Extension path = "/Mono/Data/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.MySql.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/>
@@ -15,7 +15,7 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.2"/>
</Dependencies>
<Extension path = "/Mono/Data/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
</Dependencies>
<Localizer type="Gettext" catalog="monodevelop-database"/>
Modified: extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
description = "GNU Debugger support for Mono.Debugging"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
===================================================================
@@ -5,14 +5,14 @@
description = "Managed Debugging Engine support for MDB"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Mdb" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Mdb" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
description = "Managed Debugging Engine support for MDB"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
===================================================================
@@ -6,19 +6,19 @@
url = "http://monodevelop.com/"
description = "Support for developing and deploying MeeGo applications using Mono."
category = "Mobile Development"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file = "Templates/MeeGoGtkProject.xpt.xml"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Debugger" version="4.1.13"/>
- <Addin id="Debugger.Soft" version="4.1.13"/>
- <Addin id="GtkCore" version="4.1.13"/>
- <Addin id="CSharpBinding" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Debugger" version="4.2"/>
+ <Addin id="Debugger.Soft" version="4.2"/>
+ <Addin id="GtkCore" version="4.2"/>
+ <Addin id="CSharpBinding" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "HeapBuddy Profiler Add-in"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapBuddy.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Profiling" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Profiling" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapBuddyProfilingSnapshotNode" name = "HeapBuddy snapshot node context menu">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "HeapShot Profiler Add-in"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapShot.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Profiling" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Profiling" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapShotProfilingSnapshotNode" name = "HeapShot snapshot node context menu">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "MonoDevelop Profiling Addin"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ToolBar/ProfilingPad" name = "Profiling pad toolbar">
Modified: extras/NemerleBinding/NemerleBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Nemerle Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "NemerleBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/Ambiences">
Modified: extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Samples for automating OpenOffice using Mono."
category = "Templates"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file = "OpenOfficeSpreadsheetSample.xpt.xml"/>
@@ -18,8 +18,8 @@
</Runtime>
<Dependencies>
- <Addin id = "Ide" version="4.1.13"/>
- <Addin id = "CSharpBinding" version = "4.1.13" />
+ <Addin id = "Ide" version="4.2"/>
+ <Addin id = "CSharpBinding" version = "4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
Modified: extras/PyBinding/PyBinding/PyBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "Python Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "PyBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "SourceEditor2" version = "4.1.13"/>
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "SourceEditor2" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/ValaBinding/ValaBinding.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Vala Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "Deployment" version = "4.1.13"/>
- <Addin id = "Deployment.Linux" version = "4.1.13"/>
- <Addin id = "Autotools" version = "4.1.13"/>
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "Deployment" version = "4.2"/>
+ <Addin id = "Deployment.Linux" version = "4.2"/>
+ <Addin id = "Autotools" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
url = "http://www.monodevelop.com"
description = "WebKit Web Browser component"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: main/src/addins/CBinding/CBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "C/C++ Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "Deployment" version = "4.1.13"/>
- <Addin id = "Deployment.Linux" version = "4.1.13"/>
- <Addin id = "SourceEditor2" version = "4.1.13" />
- <Addin id = "DesignerSupport" version = "4.1.13" />
- <Addin id = "Refactoring" version = "4.1.13" />
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "Deployment" version = "4.2"/>
+ <Addin id = "Deployment.Linux" version = "4.2"/>
+ <Addin id = "SourceEditor2" version = "4.2" />
+ <Addin id = "DesignerSupport" version = "4.2" />
+ <Addin id = "Refactoring" version = "4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -241,7 +241,7 @@
</Runtime>
<Dependencies>
- <Addin id = "MonoDevelop.Autotools" version = "4.1.13"/>
+ <Addin id = "MonoDevelop.Autotools" version = "4.2"/>
</Dependencies>
<Extension path = "/Autotools/SimpleSetups">
Modified: main/src/addins/CSharpBinding/CSharpBinding.addin.xml
===================================================================
@@ -273,7 +273,7 @@
<Import assembly="MonoDevelop.CSharpBinding.Autotools.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Autotools" version="4.1.13"/>
+ <Addin id="Autotools" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Autotools/SimpleSetups">
<Class class="CSharpBinding.Autotools.CSharpAutotoolsSetup" />
@@ -285,7 +285,7 @@
<Import assembly="MonoDevelop.CSharpBinding.AspNet.dll"/>
</Runtime>
<Dependencies>
- <Addin id="AspNet" version="4.1.13"/>
+ <Addin id="AspNet" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Asp/CompletionBuilders">
<Class class = "MonoDevelop.CSharp.Completion.AspLanguageBuilder" />
Modified: main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Provides basic deployment services for Linux"
category = "Deployment"
- version = "4.1.13"
+ version = "4.2"
flags = "Hidden"
compatVersion = "4.0">
@@ -15,9 +15,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Deployment" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Provides basic deployment services"
category = "Deployment"
- version = "4.1.13"
+ version = "4.2"
flags = "Hidden"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
===================================================================
@@ -7,15 +7,15 @@
url = "http://www.monodevelop.com/"
description = "Provides code metric support for monodevelop"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "MonoDevelop.CodeMetrics.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Mono Soft Debugger Support for ASP.NET"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Mono Soft Debugger Support for Moonlight"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.Moonlight" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.Moonlight" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
===================================================================
@@ -5,11 +5,11 @@
description = "Mono Soft Debugger Support"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Runtime>
Modified: main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Managed Debugging Engine support for MS.NET"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
===================================================================
@@ -6,11 +6,11 @@
description = "Support for Debugging projects"
copyright = "MIT X11"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<ExtensionPoint path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = ""
description = "Provides support for visual design of GTK# windows, dialogs and widgets."
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="libstetic.dll"/>
@@ -17,9 +17,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">
Modified: main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = ""
description = "Experimental GTK# visual designer developed during GSOC 2010 as a fork of stetic"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="libstetic2.dll"/>
@@ -17,11 +17,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="XmlEditor" version="4.1.13"/>
- <Addin id="Refactoring" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="XmlEditor" version="4.2"/>
+ <Addin id="Refactoring" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">
Modified: main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com/"
description = "Support for editing, compiling, and running Moonlight/Silverlight projects."
category = "Web Development"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13"/>
- <Addin id="AspNet" version="4.1.13" />
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="Deployment" version="4.2"/>
+ <Addin id="AspNet" version="4.2" />
</Dependencies>
<Runtime>
Modified: main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://md-xed.sourceforge.net"
description = "XML Editor"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.XmlEditor.dll" />
@@ -21,10 +21,10 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/XmlEditor/XmlFileAssociations">
Modified: main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Provides some IDE extensions useful for developing and building the Mono class libraries."
category = "Project Import and Export"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDeveloperExtensions.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/FileFormats">
@@ -51,7 +51,7 @@
<Import assembly="MonoDeveloperExtensions_nunit.dll"/>
</Runtime>
<Dependencies>
- <Addin id="NUnit" version="4.1.13"/>
+ <Addin id="NUnit" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/NUnit/TestProviders">
<Class id = "MonoTestProvider" class = "MonoDeveloper.MonoTestProvider"/>
Modified: main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://monodevelop.com"
description = "Integrates NUnit into the MonoDevelop IDE."
category = "Testing"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.NUnit.dll" />
@@ -17,8 +17,8 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<!-- Extension Points -->
Modified: main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://monodevelop.com"
description = "Support for editing and running T4 text templates."
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="Mono.TextTemplating.dll" />
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/SourceEditor2/SyntaxModes">
Modified: main/src/addins/VBNetBinding/VBNetBinding.addin.xml
===================================================================
@@ -6,11 +6,11 @@
url = "http://bard.sytes.net/vbnetbinding"
description = "VB.NET Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Git support for the Version Control Add-in"
category = "Version Control"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.VersionControl.Git.dll"/>
@@ -14,9 +14,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/VersionControl/VersionControlSystems">
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
===================================================================
@@ -6,13 +6,13 @@
url = "http://taubz.for.net/code/diff"
description = "Subversion support for Linux and MacOSX"
category = "Version Control"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
- <Addin id="VersionControl.Subversion" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
+ <Addin id="VersionControl.Subversion" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
===================================================================
@@ -7,11 +7,11 @@
description = "Subversion core engine"
category = "Version Control"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
</Addin>
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
===================================================================
@@ -7,7 +7,7 @@
description = "A MonoDevelop addin for using version control systems like Subversion"
category = "Version Control"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file="comment.png" />
@@ -24,9 +24,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/VersionControl/VersionControlSystems" name = "Version control systems">
Modified: main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
===================================================================
@@ -1,6 +1,6 @@
<Addin id = "SubversionAddinWindows"
namespace = "MonoDevelop"
- version = "4.1.13">
+ version = "4.2">
<Header>
<Name>Subversion Add-in</Name>
<Description>Subversion support for the Version Control Add-in</Description>
@@ -12,10 +12,10 @@
</Header>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
- <Addin id="VersionControl.Subversion" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
+ <Addin id="VersionControl.Subversion" version="4.2"/>
</Dependencies>
<!-- Some files are excluded twice. This is on purpose to work around some case sensivity issues. If you change this you break addin installation on windows -->
Modified: main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://monodevelop.com/"
description = "Windows Platform Support for MonoDevelop"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="WindowsPlatform.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
Modified: main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
===================================================================
@@ -6,11 +6,11 @@
description = "Test runner for the MonoDevelop unit tests"
category = "MonoDevelop Core"
isroot = "false"
- version = "4.1.13"
+ version = "4.2"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/Applications">
Commit: 2f80b29fcad590801fc9d33a6419b3bbccbb4f05
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-08 07:05:29 GMT
URL: https://github.com/mono/monodevelop/commit/2f80b29fcad590801fc9d33a6419b3bbccbb4f05
[Core] Set Solution* MSbuild properties
BXC15964 - All $(Solution) Macros for build events are undefined
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
===================================================================
@@ -37,11 +37,9 @@
using MonoDevelop.Core.Assemblies;
using MonoDevelop.Projects.Formats.MD1;
using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Core.Execution;
using Mono.Addins;
using System.Linq;
using MonoDevelop.Core.Instrumentation;
-using System.Text;
using MonoDevelop.Core.ProgressMonitoring;
namespace MonoDevelop.Projects.Formats.MSBuild
@@ -134,7 +132,9 @@ RemoteProjectBuilder GetProjectBuilder ()
projectBuilder.Dispose ();
projectBuilder = null;
}
- projectBuilder = MSBuildProjectService.GetProjectBuilder (runtime, toolsVersion, item.FileName);
+ var sln = item.ParentSolution;
+ var slnFile = sln != null ? sln.FileName : null;
+ projectBuilder = MSBuildProjectService.GetProjectBuilder (runtime, toolsVersion, item.FileName, slnFile);
lastBuildToolsVersion = toolsVersion;
lastBuildRuntime = runtime.Id;
lastFileName = item.FileName;
@@ -220,7 +220,6 @@ public override BuildResult RunTarget (IProgressMonitor monitor, string target,
if (UseMSBuildEngineForItem (Item, configuration)) {
SolutionEntityItem item = Item as SolutionEntityItem;
if (item != null) {
-
LogWriter logWriter = new LogWriter (monitor.Log);
RemoteProjectBuilder builder = GetProjectBuilder ();
var configs = GetConfigurations (item, configuration);
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
===================================================================
@@ -476,7 +476,7 @@ public static bool TrySplitResourceName (string fname, out string only_filename,
return true;
}
- public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, string toolsVersion, string file)
+ public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, string toolsVersion, string file, string solutionFile)
{
lock (builders) {
var toolsFx = Runtime.SystemAssemblyService.GetTargetFramework (new TargetFrameworkMoniker (toolsVersion));
@@ -491,7 +491,7 @@ public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, str
RemoteBuildEngine builder;
if (builders.TryGetValue (builderKey, out builder)) {
builder.ReferenceCount++;
- return new RemoteProjectBuilder (file, binDir, builder);
+ return new RemoteProjectBuilder (file, solutionFile, binDir, builder);
}
//always start the remote process explicitly, even if it's using the current runtime and fx
@@ -526,7 +526,7 @@ public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, str
builders [builderKey] = builder;
builder.ReferenceCount = 1;
- return new RemoteProjectBuilder (file, binDir, builder);
+ return new RemoteProjectBuilder (file, solutionFile, binDir, builder);
}
}
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs
===================================================================
@@ -43,9 +43,9 @@ public RemoteBuildEngine (Process proc, IBuildEngine engine)
this.engine = engine;
}
- public IProjectBuilder LoadProject (string file, string binPath)
+ public IProjectBuilder LoadProject (string file, string solutionFile, string binPath)
{
- return engine.LoadProject (file, binPath);
+ return engine.LoadProject (file, solutionFile, binPath);
}
public void UnloadProject (IProjectBuilder pb)
@@ -71,10 +71,10 @@ public class RemoteProjectBuilder: IDisposable
RemoteBuildEngine engine;
IProjectBuilder builder;
- internal RemoteProjectBuilder (string file, string binPath, RemoteBuildEngine engine)
+ internal RemoteProjectBuilder (string file, string solutionFile, string binPath, RemoteBuildEngine engine)
{
this.engine = engine;
- builder = engine.LoadProject (file, binPath);
+ builder = engine.LoadProject (file, solutionFile, binPath);
}
public MSBuildResult[] RunTarget (string target, ProjectConfigurationInfo[] configurations, ILogWriter logWriter,
Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
===================================================================
@@ -57,9 +57,9 @@ public void Dispose ()
get { return doneEvent; }
}
- public IProjectBuilder LoadProject (string file, string binDir)
+ public IProjectBuilder LoadProject (string file, string solutionFile, string binDir)
{
- return new ProjectBuilder (this, GetEngine (binDir), file);
+ return new ProjectBuilder (this, GetEngine (binDir), file, solutionFile);
}
public void UnloadProject (IProjectBuilder pb)
Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
===================================================================
@@ -59,9 +59,9 @@ public void Dispose ()
get { return doneEvent; }
}
- public IProjectBuilder LoadProject (string file, string binDir)
+ public IProjectBuilder LoadProject (string file, string solutionFile, string binDir)
{
- return new ProjectBuilder (this, GetEngine (binDir), file);
+ return new ProjectBuilder (this, GetEngine (binDir), file, solutionFile);
}
public void UnloadProject (IProjectBuilder pb)
Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
===================================================================
@@ -30,7 +30,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
{
public interface IBuildEngine: IDisposable
{
- IProjectBuilder LoadProject (string file, string binPath);
+ IProjectBuilder LoadProject (string file, string solutionFile, string binPath);
void UnloadProject (IProjectBuilder pb);
}
}
Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
===================================================================
@@ -25,10 +25,7 @@
// THE SOFTWARE.
using System;
-using System.Threading;
using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Remoting;
using Microsoft.Build.BuildEngine;
using Microsoft.Build.Framework;
using System.Collections.Generic;
@@ -41,13 +38,15 @@ public class ProjectBuilder: MarshalByRefObject, IProjectBuilder
{
Engine engine;
string file;
+ string solutionFile;
ILogWriter currentLogWriter;
MDConsoleLogger consoleLogger;
BuildEngine buildEngine;
- public ProjectBuilder (BuildEngine buildEngine, Engine engine, string file)
+ public ProjectBuilder (BuildEngine buildEngine, Engine engine, string file, string solutionFile)
{
this.file = file;
+ this.solutionFile = solutionFile;
this.engine = engine;
this.buildEngine = buildEngine;
consoleLogger = new MDConsoleLogger (LoggerVerbosity.Normal, LogWriteLine, null, null);
@@ -167,6 +166,12 @@ Project SetupProject (ProjectConfigurationInfo[] configurations)
}
}
}
+ if (!string.IsNullOrEmpty (solutionFile)) {
+ p.GlobalProperties.SetProperty ("SolutionPath", Path.GetFullPath (solutionFile));
+ p.GlobalProperties.SetProperty ("SolutionName", Path.GetFileNameWithoutExtension (solutionFile));
+ p.GlobalProperties.SetProperty ("SolutionFilename", Path.GetFileName (solutionFile));
+ p.GlobalProperties.SetProperty ("SolutionDir", Path.GetDirectoryName (solutionFile) + Path.DirectorySeparatorChar);
+ };
p.GlobalProperties.SetProperty ("Configuration", pc.Configuration);
if (!string.IsNullOrEmpty (pc.Platform))
p.GlobalProperties.SetProperty ("Platform", pc.Platform);
Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
===================================================================
@@ -25,14 +25,10 @@
// THE SOFTWARE.
using System;
-using System.Threading;
using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Remoting;
using Microsoft.Build.Evaluation;
using Microsoft.Build.Framework;
using System.Collections.Generic;
-using System.Collections;
using System.Linq;
using Microsoft.Build.Logging;
using Microsoft.Build.Execution;
@@ -44,13 +40,15 @@ public class ProjectBuilder: MarshalByRefObject, IProjectBuilder
{
ProjectCollection engine;
string file;
+ string solutionFile;
ILogWriter currentLogWriter;
ConsoleLogger consoleLogger;
BuildEngine buildEngine;
- public ProjectBuilder (BuildEngine buildEngine, ProjectCollection engine, string file)
+ public ProjectBuilder (BuildEngine buildEngine, ProjectCollection engine, string file, string solutionFile)
{
this.file = file;
+ this.solutionFile = solutionFile;
this.engine = engine;
this.buildEngine = buildEngine;
consoleLogger = new ConsoleLogger (LoggerVerbosity.Normal, LogWriteLine, null, null);
@@ -170,6 +168,12 @@ Project ConfigureProject (string file, string configuration, string platform)
p = engine.LoadProject (new XmlTextReader (new StringReader (content)));
p.FullPath = file;
}
+ if (!string.IsNullOrEmpty (solutionFile)) {
+ p.SetProperty ("SolutionPath", Path.GetFullPath (solutionFile));
+ p.SetProperty ("SolutionName", Path.GetFileNameWithoutExtension (solutionFile));
+ p.SetProperty ("SolutionFilename", Path.GetFileName (solutionFile));
+ p.SetProperty ("SolutionDir", Path.GetDirectoryName (solutionFile) + Path.DirectorySeparatorChar);
+ };
}
p.SetProperty ("Configuration", configuration);
if (!string.IsNullOrEmpty (platform))
Commit: 8dcd672f7c92a2f4bb649ce570054277a086a2f3
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-08 07:05:43 GMT
URL: https://github.com/mono/monodevelop/commit/8dcd672f7c92a2f4bb649ce570054277a086a2f3
Merge branch 'master' of github.com:mono/monodevelop
Changed paths:
M extras/AspNetEdit/AspNetEdit.addin.xml
M extras/AspNetEdit/configure
M extras/BooBinding/BooBinding.addin.xml
M extras/BooBinding/configure
M extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
M extras/GeckoWebBrowser/configure
M extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
M extras/JavaBinding/JavaBinding.addin.xml
M extras/JavaBinding/configure
M extras/LuaBinding/LuaBinding.addin.xml
M extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
M extras/MonoDevelop.AddinAuthoring/configure
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
M extras/MonoDevelop.Database/configure.in
M extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Gdb/configure
M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Mdb/configure
M extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
M extras/MonoDevelop.MeeGo/configure
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
M extras/MonoDevelop.Profiling/configure.in
M extras/NemerleBinding/NemerleBinding.addin.xml
M extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
M extras/PyBinding/PyBinding/PyBinding.addin.xml
M extras/PyBinding/configure
M extras/ValaBinding/ValaBinding.addin.xml
M extras/ValaBinding/configure.in
M extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
M extras/WebKitWebBrowser/configure
M main/configure.in
M main/external/xwt
M main/src/addins/CBinding/CBinding.addin.xml
M main/src/addins/CBinding/Compiler/GNUCompiler.cs
M main/src/addins/CSharpBinding/CSharpBinding.addin.xml
M main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
M main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
M main/src/addins/MacPlatform/MacInterop/Keychain.cs
M main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
M main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
M main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
M main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
M main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
M main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
M main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
M main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
M main/src/addins/VBNetBinding/VBNetBinding.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
M main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
M main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
M main/src/core/MonoDevelop.Core/BuildVariables.cs
M main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
M version-checks
Modified: extras/AspNetEdit/AspNetEdit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Visual Designer for ASP.NET Web Forms."
category = "Web Development"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "AspNetEdit.dll"/>
@@ -14,11 +14,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13" />
- <Addin id="AspNet" version="4.1.13" />
- <Addin id="DesignerSupport" version="4.1.13" />
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Deployment" version="4.2" />
+ <Addin id="AspNet" version="4.2" />
+ <Addin id="DesignerSupport" version="4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/DisplayBindings">
Modified: extras/AspNetEdit/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=aspnetedit
prefix=/usr/local
config=DEBUG
Modified: extras/BooBinding/BooBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://boo.codehaus.org"
description = "Boo Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "BooBinding.dll"/>
@@ -16,8 +16,8 @@
<Localizer type="Gettext" catalog="monodevelop-boo"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
<Assembly name="Boo.Lang.Compiler, Version=1.0.0.0" package="Boo" />
</Dependencies>
Modified: extras/BooBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/bin/bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-boo
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
+common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
usage ()
Modified: extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
url = "http://www.monodevelop.com"
description = "Mozilla Web Browser component using GeckoSharp and GtkMozEmbed"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/GeckoWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=geckowebbrowser
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.1.13"
+common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.2"
usage ()
Modified: extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = ""
description = "Provides a text editor for the MonoDevelop IDE based on GtkSourceView 2"
category = "MonoDevelop Core"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.SourceEditor.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<!-- Extension points -->
Modified: extras/JavaBinding/JavaBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Java Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
<Localizer type="Gettext" catalog="monodevelop-java"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/JavaBinding/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-java
prefix=/usr/local
config=DEBUG
Modified: extras/LuaBinding/LuaBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Lua Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "LuaBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
===================================================================
@@ -5,12 +5,12 @@
copyright = "MIT X11"
url = "http://www.monodevelop.com"
description = "This add-in provides utilities for creating Mono.Addins based libraries and applications"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
<!-- Extension Points -->
Modified: extras/MonoDevelop.AddinAuthoring/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop_addinauthoring
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
+common_packages=" monodevelop;4.2 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
usage ()
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.CodeAnalysis.dll"/>
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.CodeAnalysis.dll"/>
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
===================================================================
@@ -6,11 +6,11 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Ide/Commands">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database CodeGenerator Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Query" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Query" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Components Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Components.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database ConnectionManager Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Query" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Query" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Pads">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Designer Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Designer.dll"/>
@@ -15,9 +15,9 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
</Dependencies>
</Addin>
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Query Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Query.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Database/ToolBar/SqlQueryView">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/>
@@ -15,7 +15,7 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.2"/>
</Dependencies>
<Extension path = "/Mono/Data/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.MySql.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/>
@@ -15,7 +15,7 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.2"/>
</Dependencies>
<Extension path = "/Mono/Data/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
</Dependencies>
<Localizer type="Gettext" catalog="monodevelop-database"/>
Modified: extras/MonoDevelop.Database/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-database], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-database], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.4
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
GTKSHARP_REQUIRED_VERSION=2.12.8
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
description = "GNU Debugger support for Mono.Debugging"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Gdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-debugger-gdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13"
+common_packages=" monodevelop;4.2"
usage ()
Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
===================================================================
@@ -5,14 +5,14 @@
description = "Managed Debugging Engine support for MDB"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Mdb" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Mdb" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
description = "Managed Debugging Engine support for MDB"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-debugger-mdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
Modified: extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
===================================================================
@@ -6,19 +6,19 @@
url = "http://monodevelop.com/"
description = "Support for developing and deploying MeeGo applications using Mono."
category = "Mobile Development"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file = "Templates/MeeGoGtkProject.xpt.xml"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Debugger" version="4.1.13"/>
- <Addin id="Debugger.Soft" version="4.1.13"/>
- <Addin id="GtkCore" version="4.1.13"/>
- <Addin id="CSharpBinding" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Debugger" version="4.2"/>
+ <Addin id="Debugger.Soft" version="4.2"/>
+ <Addin id="GtkCore" version="4.2"/>
+ <Addin id="CSharpBinding" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
Modified: extras/MonoDevelop.MeeGo/configure
===================================================================
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
prefix=/usr/local
-common_packages=" mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
{
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "HeapBuddy Profiler Add-in"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapBuddy.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Profiling" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Profiling" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapBuddyProfilingSnapshotNode" name = "HeapBuddy snapshot node context menu">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "HeapShot Profiler Add-in"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapShot.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Profiling" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Profiling" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapShotProfilingSnapshotNode" name = "HeapShot snapshot node context menu">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "MonoDevelop Profiling Addin"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ToolBar/ProfilingPad" name = "Profiling pad toolbar">
Modified: extras/MonoDevelop.Profiling/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-profiling], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-profiling], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
@@ -42,7 +42,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
GTKSHARP_REQUIRED_VERSION=2.12.8
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/NemerleBinding/NemerleBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Nemerle Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "NemerleBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/Ambiences">
Modified: extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Samples for automating OpenOffice using Mono."
category = "Templates"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file = "OpenOfficeSpreadsheetSample.xpt.xml"/>
@@ -18,8 +18,8 @@
</Runtime>
<Dependencies>
- <Addin id = "Ide" version="4.1.13"/>
- <Addin id = "CSharpBinding" version = "4.1.13" />
+ <Addin id = "Ide" version="4.2"/>
+ <Addin id = "CSharpBinding" version = "4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
Modified: extras/PyBinding/PyBinding/PyBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "Python Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "PyBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "SourceEditor2" version = "4.1.13"/>
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "SourceEditor2" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/PyBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-python
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
Modified: extras/ValaBinding/ValaBinding.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Vala Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "Deployment" version = "4.1.13"/>
- <Addin id = "Deployment.Linux" version = "4.1.13"/>
- <Addin id = "Autotools" version = "4.1.13"/>
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "Deployment" version = "4.2"/>
+ <Addin id = "Deployment.Linux" version = "4.2"/>
+ <Addin id = "Autotools" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/ValaBinding/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-vala], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-vala], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE(1.9 tar-ustar)
AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
LIBVALA_REQUIRED_VERSION=0.12.0
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
url = "http://www.monodevelop.com"
description = "WebKit Web Browser component"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/WebKitWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=webkitwebbrowser
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 webkit-sharp-1.0;0.2"
+common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.2 webkit-sharp-1.0;0.2"
usage ()
Modified: main/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 4.1.13, [[email protected]])
+AC_INIT([monodevelop], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.10 tar-ustar])
AM_MAINTAINER_MODE
@@ -12,7 +12,7 @@ ASSEMBLY_VERSION=4.0.0.0
# the C# side of things. It should be one of the following two formats:
# 1) "VERSION_NUMBER" "2.0"
# 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER" "2.0 Alpha 1"
-PACKAGE_VERSION_LABEL="4.1.13"
+PACKAGE_VERSION_LABEL="4.2"
COMPAT_ADDIN_VERSION=4.0
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 4ba97a9b9735565e706c03c5755a648d997a52c6
+Subproject commit 4894929736f80101fd56c31b2b076fa7765d2057
Modified: main/src/addins/CBinding/CBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "C/C++ Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "Deployment" version = "4.1.13"/>
- <Addin id = "Deployment.Linux" version = "4.1.13"/>
- <Addin id = "SourceEditor2" version = "4.1.13" />
- <Addin id = "DesignerSupport" version = "4.1.13" />
- <Addin id = "Refactoring" version = "4.1.13" />
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "Deployment" version = "4.2"/>
+ <Addin id = "Deployment.Linux" version = "4.2"/>
+ <Addin id = "SourceEditor2" version = "4.2" />
+ <Addin id = "DesignerSupport" version = "4.2" />
+ <Addin id = "Refactoring" version = "4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -241,7 +241,7 @@
</Runtime>
<Dependencies>
- <Addin id = "MonoDevelop.Autotools" version = "4.1.13"/>
+ <Addin id = "MonoDevelop.Autotools" version = "4.2"/>
</Dependencies>
<Extension path = "/Autotools/SimpleSetups">
Modified: main/src/addins/CBinding/Compiler/GNUCompiler.cs
===================================================================
@@ -83,9 +83,9 @@ public abstract class GNUCompiler : CCompiler
string outputName = Path.Combine (configuration.OutputDirectory,
configuration.CompiledOutputName);
- // Precompile header files and place them in .prec/<config_name>/
+ // Precompile header files and place them in prec/<config_name>/
if (configuration.PrecompileHeaders) {
- string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
string precConfigDir = Path.Combine (precDir, configuration.Id);
if (!Directory.Exists (precDir))
Directory.CreateDirectory (precDir);
@@ -188,7 +188,7 @@ public override string GetCompilerFlags (Project project, CProjectConfiguration
args.Append ("-I\"" + StringParserService.Parse (inc, GetStringTags (project)) + "\" ");
if (configuration.PrecompileHeaders) {
- string precdir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precdir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
precdir = Path.Combine (precdir, configuration.Id);
args.Append ("-I\"" + precdir + "\"");
}
@@ -279,7 +279,7 @@ private string[] DependedOnFiles (ProjectFile file, CProjectConfiguration config
foreach (ProjectFile file in projectFiles) {
if (file.Subtype == Subtype.Code && CProject.IsHeaderFile (file.Name)) {
- string precomp = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precomp = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
precomp = Path.Combine (precomp, configuration.Id);
precomp = Path.Combine (precomp, Path.GetFileName (file.Name) + ".ghc");
if (file.BuildAction == BuildAction.Compile) {
@@ -623,10 +623,10 @@ public override void Clean (ProjectFileCollection projectFiles, CProjectConfigur
void CleanPrecompiledHeaders (CProjectConfiguration configuration)
{
- if (string.IsNullOrEmpty (configuration.SourceDirectory))
+ if (string.IsNullOrEmpty (configuration.IntermediateOutputDirectory))
return;
- string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
if (Directory.Exists (precDir))
Directory.Delete (precDir, true);
Modified: main/src/addins/CSharpBinding/CSharpBinding.addin.xml
===================================================================
@@ -273,7 +273,7 @@
<Import assembly="MonoDevelop.CSharpBinding.Autotools.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Autotools" version="4.1.13"/>
+ <Addin id="Autotools" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Autotools/SimpleSetups">
<Class class="CSharpBinding.Autotools.CSharpAutotoolsSetup" />
@@ -285,7 +285,7 @@
<Import assembly="MonoDevelop.CSharpBinding.AspNet.dll"/>
</Runtime>
<Dependencies>
- <Addin id="AspNet" version="4.1.13"/>
+ <Addin id="AspNet" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Asp/CompletionBuilders">
<Class class = "MonoDevelop.CSharp.Completion.AspLanguageBuilder" />
Modified: main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Provides basic deployment services for Linux"
category = "Deployment"
- version = "4.1.13"
+ version = "4.2"
flags = "Hidden"
compatVersion = "4.0">
@@ -15,9 +15,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Deployment" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Provides basic deployment services"
category = "Deployment"
- version = "4.1.13"
+ version = "4.2"
flags = "Hidden"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -528,11 +528,8 @@ static unsafe string GetUsernameFromKeychainItemRef (IntPtr itemRef)
0, null, (uint) path.Length, path, (ushort) uri.Port,
protocol, auth, out passwordLength, out passwordData, ref item);
- if (result == OSStatus.ItemNotFound)
- return null;
-
if (result != OSStatus.Ok)
- throw new Exception ("Could not find internet username and password: " + GetError (result));
+ return null;
var username = GetUsernameFromKeychainItemRef (item);
@@ -564,11 +561,8 @@ public static string FindInternetPassword (Uri uri)
CFRelease (item);
- if (result == OSStatus.ItemNotFound)
- return null;
-
if (result != OSStatus.Ok)
- throw new Exception ("Could not find internet password: " + GetError (result));
+ return null;
return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
}
Modified: main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
===================================================================
@@ -7,15 +7,15 @@
url = "http://www.monodevelop.com/"
description = "Provides code metric support for monodevelop"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "MonoDevelop.CodeMetrics.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Mono Soft Debugger Support for ASP.NET"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Mono Soft Debugger Support for Moonlight"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.Moonlight" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.Moonlight" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
===================================================================
@@ -5,11 +5,11 @@
description = "Mono Soft Debugger Support"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Runtime>
Modified: main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Managed Debugging Engine support for MS.NET"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
===================================================================
@@ -6,11 +6,11 @@
description = "Support for Debugging projects"
copyright = "MIT X11"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<ExtensionPoint path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = ""
description = "Provides support for visual design of GTK# windows, dialogs and widgets."
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="libstetic.dll"/>
@@ -17,9 +17,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">
Modified: main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = ""
description = "Experimental GTK# visual designer developed during GSOC 2010 as a fork of stetic"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="libstetic2.dll"/>
@@ -17,11 +17,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="XmlEditor" version="4.1.13"/>
- <Addin id="Refactoring" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="XmlEditor" version="4.2"/>
+ <Addin id="Refactoring" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">
Modified: main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com/"
description = "Support for editing, compiling, and running Moonlight/Silverlight projects."
category = "Web Development"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13"/>
- <Addin id="AspNet" version="4.1.13" />
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="Deployment" version="4.2"/>
+ <Addin id="AspNet" version="4.2" />
</Dependencies>
<Runtime>
Modified: main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://md-xed.sourceforge.net"
description = "XML Editor"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.XmlEditor.dll" />
@@ -21,10 +21,10 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/XmlEditor/XmlFileAssociations">
Modified: main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Provides some IDE extensions useful for developing and building the Mono class libraries."
category = "Project Import and Export"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDeveloperExtensions.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/FileFormats">
@@ -51,7 +51,7 @@
<Import assembly="MonoDeveloperExtensions_nunit.dll"/>
</Runtime>
<Dependencies>
- <Addin id="NUnit" version="4.1.13"/>
+ <Addin id="NUnit" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/NUnit/TestProviders">
<Class id = "MonoTestProvider" class = "MonoDeveloper.MonoTestProvider"/>
Modified: main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://monodevelop.com"
description = "Integrates NUnit into the MonoDevelop IDE."
category = "Testing"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.NUnit.dll" />
@@ -17,8 +17,8 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<!-- Extension Points -->
Modified: main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://monodevelop.com"
description = "Support for editing and running T4 text templates."
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="Mono.TextTemplating.dll" />
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/SourceEditor2/SyntaxModes">
Modified: main/src/addins/VBNetBinding/VBNetBinding.addin.xml
===================================================================
@@ -6,11 +6,11 @@
url = "http://bard.sytes.net/vbnetbinding"
description = "VB.NET Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Git support for the Version Control Add-in"
category = "Version Control"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.VersionControl.Git.dll"/>
@@ -14,9 +14,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/VersionControl/VersionControlSystems">
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
===================================================================
@@ -6,13 +6,13 @@
url = "http://taubz.for.net/code/diff"
description = "Subversion support for Linux and MacOSX"
category = "Version Control"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
- <Addin id="VersionControl.Subversion" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
+ <Addin id="VersionControl.Subversion" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
===================================================================
@@ -7,11 +7,11 @@
description = "Subversion core engine"
category = "Version Control"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
</Addin>
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
===================================================================
@@ -7,7 +7,7 @@
description = "A MonoDevelop addin for using version control systems like Subversion"
category = "Version Control"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file="comment.png" />
@@ -24,9 +24,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/VersionControl/VersionControlSystems" name = "Version control systems">
Modified: main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
===================================================================
@@ -1,6 +1,6 @@
<Addin id = "SubversionAddinWindows"
namespace = "MonoDevelop"
- version = "4.1.13">
+ version = "4.2">
<Header>
<Name>Subversion Add-in</Name>
<Description>Subversion support for the Version Control Add-in</Description>
@@ -12,10 +12,10 @@
</Header>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
- <Addin id="VersionControl.Subversion" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
+ <Addin id="VersionControl.Subversion" version="4.2"/>
</Dependencies>
<!-- Some files are excluded twice. This is on purpose to work around some case sensivity issues. If you change this you break addin installation on windows -->
Modified: main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://monodevelop.com/"
description = "Windows Platform Support for MonoDevelop"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="WindowsPlatform.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
Modified: main/src/core/MonoDevelop.Core/BuildVariables.cs
===================================================================
@@ -2,8 +2,8 @@ namespace MonoDevelop
{
public static class BuildInfo
{
- public const string Version = "4.1.13";
- public const string VersionLabel = "4.1.13";
+ public const string Version = "4.2";
+ public const string VersionLabel = "4.2";
public const string CompatVersion = "4.0";
}
}
Modified: main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
===================================================================
@@ -6,11 +6,11 @@
description = "Test runner for the MonoDevelop unit tests"
category = "MonoDevelop Core"
isroot = "false"
- version = "4.1.13"
+ version = "4.2"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/Applications">
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=3d230f0a822fb49b50a280d108878bd91335b338
+DEP_NEEDED_VERSION[0]=9afde49791dc3aee4f732aecbbebf4fa3fea8616
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: cdf4be3297ee1b77f65dac616aa0ffd7355f02d9
Author: Alex Corrado <[email protected]> (chkn)
Date: 2013-11-08 20:58:01 GMT
URL: https://github.com/mono/monodevelop/commit/cdf4be3297ee1b77f65dac616aa0ffd7355f02d9
[build] Bump xwt and md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 4894929736f80101fd56c31b2b076fa7765d2057
+Subproject commit 67a97ff70ffd5b488a4073ae7abad2173054c6c5
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=9afde49791dc3aee4f732aecbbebf4fa3fea8616
+DEP_NEEDED_VERSION[0]=b05b15b4a1b1fac5a3233491ce05479819e75d1e
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 9e3bc60eed7953b053ceca1fea4bc75640350e68
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-08 23:18:36 GMT
URL: https://github.com/mono/monodevelop/commit/9e3bc60eed7953b053ceca1fea4bc75640350e68
code cleanup
Changed paths:
M main/src/addins/MacPlatform/MacInterop/Keychain.cs
Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -26,13 +26,8 @@
// THE SOFTWARE.
using System;
-using System.Linq;
using System.Text;
-using System.Collections.Generic;
using System.Runtime.InteropServices;
-using System.Security.Cryptography.X509Certificates;
-
-using MonoDevelop.Core;
namespace MonoDevelop.MacInterop
{
Commit: 400bdc75f7e9686ca00859d9b54771205c9bbf6c
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-08 23:29:43 GMT
URL: https://github.com/mono/monodevelop/commit/400bdc75f7e9686ca00859d9b54771205c9bbf6c
bumped version-checks to fix the build
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=b05b15b4a1b1fac5a3233491ce05479819e75d1e
+DEP_NEEDED_VERSION[0]=aeeb5b3118083e0e609eaf8c5a35687c0d6dcfde
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: d27fa365b681ca30e8f2184359cbd8c34ee90eb0
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-11 05:59:03 GMT
URL: https://github.com/mono/monodevelop/commit/d27fa365b681ca30e8f2184359cbd8c34ee90eb0
Fixed 'Bug 15962 - [regression] Solution-wide code-formatting settings
are no longer respected'
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
===================================================================
@@ -41,6 +41,7 @@ internal class StyledSourceEditorOptions : ISourceEditorOptions
EventHandler changed;
IEnumerable<string> mimeTypes;
TextStylePolicy currentPolicy;
+ string lastMimeType;
public StyledSourceEditorOptions (Project styleParent, string mimeType)
{
@@ -51,10 +52,13 @@ public StyledSourceEditorOptions (Project styleParent, string mimeType)
get { return currentPolicy; }
}
+
public void UpdateStyleParent (Project styleParent, string mimeType)
{
- if (styleParent != null && policyContainer == styleParent.Policies)
+ if (styleParent != null && policyContainer == styleParent.Policies && mimeType == lastMimeType)
return;
+ lastMimeType = mimeType;
+
if (policyContainer != null)
policyContainer.PolicyChanged -= HandlePolicyChanged;
@@ -66,8 +70,8 @@ public void UpdateStyleParent (Project styleParent, string mimeType)
policyContainer = styleParent.Policies;
else
policyContainer = MonoDevelop.Projects.Policies.PolicyService.DefaultPolicies;
-
currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
+
policyContainer.PolicyChanged += HandlePolicyChanged;
if (changed != null)
this.changed (this, EventArgs.Empty);
Commit: eeccd5f119f7e2ad0e2e11891e6f7d63c3b7fc4c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-11 06:58:18 GMT
URL: https://github.com/mono/monodevelop/commit/eeccd5f119f7e2ad0e2e11891e6f7d63c3b7fc4c
Fixed 'Bug 15985 - Implement abstract type produces invalid code'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit a01f5b37b0ddcb072b63a55b0fa4b91cbcd716c1
+Subproject commit 68ad5a4d73be73ca5dc80d2490885638bcc2591c
Commit: ae9523c2fa288c3bdcb3399d7b12ce9cbfbe4d2f
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-11 13:13:58 GMT
URL: https://github.com/mono/monodevelop/commit/ae9523c2fa288c3bdcb3399d7b12ce9cbfbe4d2f
Fixed 'Bug 16061 - Opening our solution locks up Xamarin Studio on
4.2.0, high CPU (180%+) and lots of threads'
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
===================================================================
@@ -939,10 +939,18 @@ public class ProjectContentWrapper
public bool ReferencesConnected {
get {
- return referencesConnected && referencedWrappers.All (w => w.ReferencesConnected);
+ return GetReferencesConnected (this, new HashSet<ProjectContentWrapper> ());
}
}
+ static bool GetReferencesConnected (ProjectContentWrapper pcw, HashSet<ProjectContentWrapper> wrapper)
+ {
+ if (wrapper.Contains (pcw))
+ return true;
+ wrapper.Add (pcw);
+ return pcw.referencesConnected && pcw.referencedWrappers.All (w => GetReferencesConnected (w, wrapper));
+ }
+
public IProjectContent Content {
get {
if (!referencesConnected) {
@@ -2693,22 +2701,22 @@ static void CheckModifiedFiles (Project project, ProjectFile[] projectFiles, Pro
content.RunWhenLoaded (delegate(IProjectContent cnt) {
try {
content.LoadOperationDepth++;
- var modifiedFiles = new List<ProjectFile> ();
- var oldFileNewFile = new List<Tuple<ProjectFile, IUnresolvedFile>> ();
-
+ var modifiedFiles = new List<ProjectFile> ();
+ var oldFileNewFile = new List<Tuple<ProjectFile, IUnresolvedFile>> ();
+
foreach (var file in projectFiles) {
if (file.BuildAction == null)
continue;
// if the file is already inside the content a parser exists for it, if not check if it can be parsed.
- var oldFile = cnt.GetFile (file.Name);
+ var oldFile = cnt.GetFile (file.Name);
oldFileNewFile.Add (Tuple.Create (file, oldFile));
}
// This is disk intensive and slow
oldFileNewFile.RemoveAll (t => !IsFileModified (t.Item1, t.Item2));
- foreach (var v in oldFileNewFile) {
- var file = v.Item1;
+ foreach (var v in oldFileNewFile) {
+ var file = v.Item1;
var oldFile = v.Item2;
if (oldFile == null) {
var parser = TypeSystemService.GetParser (DesktopService.GetMimeTypeForUri (file.Name), file.BuildAction);
Commit: a82ec20632c3bbc09d7218ffe4b254b8d6e2d611
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-11 13:58:53 GMT
URL: https://github.com/mono/monodevelop/commit/a82ec20632c3bbc09d7218ffe4b254b8d6e2d611
[CodeIssuesPad] Add Project grouping
Also has unit tests! =D
Changed paths:
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
M main/tests/UnitTests/MonoDevelop.Refactoring/GroupingProviderTestBase.cs
M main/tests/UnitTests/UnitTests.csproj
Added paths:
A main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
A main/tests/UnitTests/MonoDevelop.Refactoring/ProjectGroupingProviderTests.cs
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
===================================================================
@@ -78,7 +78,8 @@ public class CodeIssuePadControl : VBox
static readonly Type[] groupingProviders = {
typeof(CategoryGroupingProvider),
typeof(ProviderGroupingProvider),
- typeof(SeverityGroupingProvider)
+ typeof(SeverityGroupingProvider),
+ typeof(ProjectGroupingProvider)
};
public CodeIssuePadControl ()
Added: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
===================================================================
@@ -0,0 +1,46 @@
+//
+// ProjectGroupingProvider.cs
+//
+// Author:
+// Marius Ungureanu <[email protected]>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Projects;
+using System;
+
+namespace MonoDevelop.CodeIssues
+{
+ [GroupingDescription("Project")]
+ public class ProjectGroupingProvider : AbstractGroupingProvider<Project>
+ {
+ #region implemented abstract members of AbstractGroupingProvider
+ protected override Project GetGroupingKey (IssueSummary issue)
+ {
+ return issue.Project;
+ }
+ protected override string GetGroupName (IssueSummary issue)
+ {
+ return issue.Project.Name;
+ }
+ #endregion
+ }
+}
+
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
===================================================================
@@ -19,8 +19,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Refactoring\MonoDevelop.Refactoring.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -30,8 +30,8 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Refactoring\MonoDevelop.Refactoring.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -152,6 +152,7 @@
<Compile Include="MonoDevelop.CodeIssues\Runner\IJobContext.cs" />
<Compile Include="MonoDevelop.CodeIssues\Runner\JobSlice.cs" />
<Compile Include="MonoDevelop.CodeIssues\Runner\JobStatus.cs" />
+ <Compile Include="MonoDevelop.CodeIssues\ProjectGroupingProvider.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="MonoDevelop.Refactoring\" />
Modified: main/tests/UnitTests/MonoDevelop.Refactoring/GroupingProviderTestBase.cs
===================================================================
@@ -28,6 +28,7 @@
using ICSharpCode.NRefactory.Refactoring;
using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.NRefactory;
+using MonoDevelop.Projects;
namespace MonoDevelop.Refactoring
{
@@ -65,7 +66,10 @@ public abstract class GroupingProviderTestBase<T> where T: IGroupingProvider
ProviderDescription = "ProviderDescription",
ProviderTitle = "ProviderTitle",
Region = new DomRegion("fileName", new TextLocation(2, 3), new TextLocation(2, 10)),
- Severity = Severity.None
+ Severity = Severity.None,
+ Project = new DotNetAssemblyProject {
+ Name = "ProjectName"
+ }
};
}
Added: main/tests/UnitTests/MonoDevelop.Refactoring/ProjectGroupingProviderTests.cs
===================================================================
@@ -0,0 +1,56 @@
+//
+// ProjectGroupingProviderTests.cs
+//
+// Author:
+// Marius Ungureanu <[email protected]>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.CodeIssues;
+using ICSharpCode.NRefactory.Refactoring;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.Refactoring
+{
+ public class ProjectGroupingProviderTests : GroupingProviderTestBase<ProjectGroupingProvider>
+ {
+ #region implemented abstract members of GroupingProviderTestBase
+
+ protected override ProjectGroupingProvider CreateProviderInstance ()
+ {
+ return new ProjectGroupingProvider ();
+ }
+
+ protected override IssueSummary[] GetDistinctSummaries ()
+ {
+ return new [] {
+ new IssueSummary {
+ Project = new DotNetAssemblyProject { Name = "Project1" }
+ },
+ new IssueSummary {
+ Project = new DotNetAssemblyProject { Name = "Project2" }
+ }
+ };
+ }
+
+ #endregion
+ }
+}
+
Modified: main/tests/UnitTests/UnitTests.csproj
===================================================================
@@ -296,6 +296,7 @@
<Compile Include="MonoDevelop.CSharpBinding\UnitTesteditorIntegrationTests.cs" />
<Compile Include="MonoDevelop.Refactoring\AnalysisJobQueueTests.cs" />
<Compile Include="MonoDevelop.Refactoring\SimpleAnalysisJobTests.cs" />
+ <Compile Include="MonoDevelop.Refactoring\ProjectGroupingProviderTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\md.targets" />
Commit: 6d5eac8905c119fcb5e04402ce7ab03beac7854b
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-11 14:46:07 GMT
URL: https://github.com/mono/monodevelop/commit/6d5eac8905c119fcb5e04402ce7ab03beac7854b
Fixed 'Bug 16108 - Convert to autoproperty issues'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 68ad5a4d73be73ca5dc80d2490885638bcc2591c
+Subproject commit f8ca2fe1fcf10e5a89c4bdaf267731cce161eeff
Commit: 735f9c309cedee9f2b58f06de51d5abc48cc1061
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-11 14:51:25 GMT
URL: https://github.com/mono/monodevelop/commit/735f9c309cedee9f2b58f06de51d5abc48cc1061
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit f8ca2fe1fcf10e5a89c4bdaf267731cce161eeff
+Subproject commit ceeee95cc57169a5cba9c7a3503c524393a152f0
Commit: c760fa4c697280574da6fde58898f1908008dafe
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-11 18:45:47 GMT
URL: https://github.com/mono/monodevelop/commit/c760fa4c697280574da6fde58898f1908008dafe
[CodeIssuesPad] Add File Grouping
Changed paths:
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
M main/tests/UnitTests/MonoDevelop.Refactoring/GroupingProviderTestBase.cs
M main/tests/UnitTests/MonoDevelop.Refactoring/ProjectGroupingProviderTests.cs
M main/tests/UnitTests/UnitTests.csproj
Added paths:
A main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
A main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
===================================================================
@@ -79,7 +79,8 @@ public class CodeIssuePadControl : VBox
typeof(CategoryGroupingProvider),
typeof(ProviderGroupingProvider),
typeof(SeverityGroupingProvider),
- typeof(ProjectGroupingProvider)
+ typeof(ProjectGroupingProvider),
+ typeof(FileGroupingProvider)
};
public CodeIssuePadControl ()
Added: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
===================================================================
@@ -0,0 +1,50 @@
+//
+// FileGroupingProvider.cs
+//
+// Author:
+// Marius Ungureanu <[email protected]>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+ [GroupingDescription("File")]
+ public class FileGroupingProvider : AbstractGroupingProvider<ProjectFile>
+ {
+ #region implemented abstract members of AbstractGroupingProvider
+ protected override ProjectFile GetGroupingKey (IssueSummary issue)
+ {
+ return issue.File;
+ }
+ protected override string GetGroupName (IssueSummary issue)
+ {
+ FilePath parent = issue.Project.FileName.ParentDirectory;
+ FilePath current = issue.File.FilePath;
+ if (current.IsChildPathOf (current))
+ return issue.File.FilePath.ToRelative (parent);
+ return current.ToRelative (issue.Project.ParentSolution.BaseDirectory);
+ }
+ #endregion
+ }
+}
+
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
===================================================================
@@ -24,7 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using MonoDevelop.Projects;
-using System;
namespace MonoDevelop.CodeIssues
{
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
===================================================================
@@ -153,6 +153,7 @@
<Compile Include="MonoDevelop.CodeIssues\Runner\JobSlice.cs" />
<Compile Include="MonoDevelop.CodeIssues\Runner\JobStatus.cs" />
<Compile Include="MonoDevelop.CodeIssues\ProjectGroupingProvider.cs" />
+ <Compile Include="MonoDevelop.CodeIssues\FileGroupingProvider.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="MonoDevelop.Refactoring\" />
Added: main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs
===================================================================
@@ -0,0 +1,55 @@
+//
+// FileGroupingProviderTests.cs
+//
+// Author:
+// Marius Ungureanu <[email protected]>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.CodeIssues;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.Refactoring
+{
+ public class FileGroupingProviderTests : GroupingProviderTestBase<FileGroupingProvider>
+ {
+ #region implemented abstract members of GroupingProviderTestBase
+
+ protected override FileGroupingProvider CreateProviderInstance ()
+ {
+ return new FileGroupingProvider ();
+ }
+
+ protected override IssueSummary[] GetDistinctSummaries ()
+ {
+ return new [] {
+ new IssueSummary {
+ File = new ProjectFile ("File1")
+ },
+ new IssueSummary {
+ File = new ProjectFile ("File2")
+ }
+ };
+ }
+
+ #endregion
+ }
+}
+
Modified: main/tests/UnitTests/MonoDevelop.Refactoring/GroupingProviderTestBase.cs
===================================================================
@@ -69,7 +69,8 @@ public abstract class GroupingProviderTestBase<T> where T: IGroupingProvider
Severity = Severity.None,
Project = new DotNetAssemblyProject {
Name = "ProjectName"
- }
+ },
+ File = new ProjectFile ("FileName")
};
}
Modified: main/tests/UnitTests/MonoDevelop.Refactoring/ProjectGroupingProviderTests.cs
===================================================================
@@ -24,7 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using MonoDevelop.CodeIssues;
-using ICSharpCode.NRefactory.Refactoring;
using MonoDevelop.Projects;
namespace MonoDevelop.Refactoring
Modified: main/tests/UnitTests/UnitTests.csproj
===================================================================
@@ -297,6 +297,7 @@
<Compile Include="MonoDevelop.Refactoring\AnalysisJobQueueTests.cs" />
<Compile Include="MonoDevelop.Refactoring\SimpleAnalysisJobTests.cs" />
<Compile Include="MonoDevelop.Refactoring\ProjectGroupingProviderTests.cs" />
+ <Compile Include="MonoDevelop.Refactoring\FileGroupingProviderTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\md.targets" />
Commit: 27ad848ce12ceb748328b9aef4de873a88333a40
Author: Jérémie Laval <[email protected]> (garuma)
Date: 2013-11-11 19:53:59 GMT
URL: https://github.com/mono/monodevelop/commit/27ad848ce12ceb748328b9aef4de873a88333a40
[build] Get a build going
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=aeeb5b3118083e0e609eaf8c5a35687c0d6dcfde
+DEP_NEEDED_VERSION[0]=f93bf25efa84e91fe134e027a90645666f20346e
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 27c01cdc19e5ec19e9c0a854d51738d357aa61c1
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-11-11 20:02:08 GMT
URL: https://github.com/mono/monodevelop/commit/27c01cdc19e5ec19e9c0a854d51738d357aa61c1
Fixed Subversion on Mavericks
Changed paths:
M main/build/MacOSX/monostub.m
Modified: main/build/MacOSX/monostub.m
===================================================================
@@ -269,7 +269,8 @@
char *variable;
char buf[32];
- push_env ("DYLD_FALLBACK_LIBRARY_PATH", "/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib");
+ /* CommandLineTools are needed for OSX 10.9+ */
+ push_env ("DYLD_FALLBACK_LIBRARY_PATH", "/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib:/Library/Developer/CommandLineTools/usr/lib");
/* Mono "External" directory */
push_env ("PKG_CONFIG_PATH", "/Library/Frameworks/Mono.framework/External/pkgconfig");
Commit: f174b586439e09631095ed8001eb74de970743cb
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-11 20:18:46 GMT
URL: https://github.com/mono/monodevelop/commit/f174b586439e09631095ed8001eb74de970743cb
[CodeIssuePad] Fix unit tests.
Changed paths:
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
M main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
===================================================================
@@ -38,11 +38,7 @@ protected override ProjectFile GetGroupingKey (IssueSummary issue)
}
protected override string GetGroupName (IssueSummary issue)
{
- FilePath parent = issue.Project.FileName.ParentDirectory;
- FilePath current = issue.File.FilePath;
- if (current.IsChildPathOf (current))
- return issue.File.FilePath.ToRelative (parent);
- return current.ToRelative (issue.Project.ParentSolution.BaseDirectory);
+ return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);
}
#endregion
}
Modified: main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs
===================================================================
@@ -25,6 +25,7 @@
// THE SOFTWARE.
using MonoDevelop.CodeIssues;
using MonoDevelop.Projects;
+using System.IO;
namespace MonoDevelop.Refactoring
{
@@ -41,10 +42,16 @@ protected override IssueSummary[] GetDistinctSummaries ()
{
return new [] {
new IssueSummary {
- File = new ProjectFile ("File1")
+ File = new ProjectFile (Path.Combine ("Directory1", "File1")),
+ Project = new DotNetAssemblyProject {
+ BaseDirectory = "Directory1"
+ }
},
new IssueSummary {
- File = new ProjectFile ("File2")
+ File = new ProjectFile (Path.Combine ("Directory2", "File2")),
+ Project = new DotNetAssemblyProject {
+ BaseDirectory = "Directory1"
+ }
}
};
}
Commit: 0d5e1f22c49bb1a38d83ba17510f6a01fa8eada4
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-11-11 21:16:25 GMT
URL: https://github.com/mono/monodevelop/commit/0d5e1f22c49bb1a38d83ba17510f6a01fa8eada4
[NUnit] Fix the execution of single tests
We need to use the TestId as that is the thing which uniquely identifes
both single tests and also test fixtures.
Changed paths:
M main/external/guiunit
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
M version-checks
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 1fe9c1e7f5675a1cbdd9d8cc8c9b93df070501b6
+Subproject commit d7e684423ec8e7a6aaf9ed0bf585b09abb5120fb
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -474,7 +474,7 @@ UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test,
bool automaticUpdates = cmd.Command.Contains ("GuiUnit") || (cmd.Command.Contains ("mdtool.exe") && cmd.Arguments.Contains ("run-md-tests"));
if (!string.IsNullOrEmpty(pathName))
- cmd.Arguments += " -run=" + pathName;
+ cmd.Arguments += " -run=" + test.TestId;
if (automaticUpdates) {
tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
cmd.Arguments += " -port=" + tcpListener.Port;
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=f93bf25efa84e91fe134e027a90645666f20346e
+DEP_NEEDED_VERSION[0]=c74f0c3f98f2281692693eb62176b550ba075c5a
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 07480366a215c551b241448d6f3009604081de8b
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-11-11 21:54:13 GMT
URL: https://github.com/mono/monodevelop/commit/07480366a215c551b241448d6f3009604081de8b
Use a real md-addins hash
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=c74f0c3f98f2281692693eb62176b550ba075c5a
+DEP_NEEDED_VERSION[0]=17c53fa30aaa4a70e43962832592e4ad936630e3
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 26ff3d8dd57873395072bcf7b76eebdc61f1f936
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-11-11 21:56:13 GMT
URL: https://github.com/mono/monodevelop/commit/26ff3d8dd57873395072bcf7b76eebdc61f1f936
[Core] Expose SystemAssemblyService.CreateClosedUniverse
We need it to be able to use IKVM.Reflection in non-explodey ways.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
===================================================================
@@ -312,7 +312,7 @@ static void BuildFrameworkRelations (TargetFramework fx, Dictionary<TargetFramew
fx.RelationsBuilt = true;
}
- static IKVM.Reflection.Universe CreateClosedUniverse ()
+ public static IKVM.Reflection.Universe CreateClosedUniverse ()
{
const IKVM.Reflection.UniverseOptions ikvmOptions =
IKVM.Reflection.UniverseOptions.DisablePseudoCustomAttributeRetrieval |
Commit: d6497928dccba901467c2f766a8abe6ccf2e78b4
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-12 02:01:30 GMT
URL: https://github.com/mono/monodevelop/commit/d6497928dccba901467c2f766a8abe6ccf2e78b4
[Web References] Full cleanup!
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/AddinInfo.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommands.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/UserPasswordDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ClientOptions.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/CollectionMapping.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ExtensionFile.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataFile.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataSource.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferenceGroup.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferencedAssembly.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryNetworkCredential.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
Modified: main/src/addins/MonoDevelop.WebReferences/AddinInfo.cs
===================================================================
@@ -1,7 +1,5 @@
-using System;
using Mono.Addins;
-using Mono.Addins.Description;
[assembly:Addin ("WebReferences",
Namespace = "MonoDevelop",
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
===================================================================
@@ -1,5 +1,4 @@
using System;
-using System.IO;
using System.Linq;
using MonoDevelop.Components.Commands;
using MonoDevelop.Core;
@@ -9,8 +8,6 @@
using MonoDevelop.Ide;
using System.Collections.Generic;
using MonoDevelop.Core.Assemblies;
-using System.Threading.Tasks;
-using System.ServiceModel;
namespace MonoDevelop.WebReferences.Commands
{
@@ -22,7 +19,7 @@ public class WebReferenceCommandHandler : NodeCommandHandler
}
/// <summary>Execute the command for adding a new web reference to a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Add)]
+ [CommandHandler (WebReferenceCommands.Add)]
public void NewWebReference()
{
// Get the project and project folder
@@ -58,8 +55,8 @@ public void NewWebReference()
}
}
- [CommandUpdateHandler (MonoDevelop.WebReferences.WebReferenceCommands.Update)]
- [CommandUpdateHandler (MonoDevelop.WebReferences.WebReferenceCommands.UpdateAll)]
+ [CommandUpdateHandler (WebReferenceCommands.Update)]
+ [CommandUpdateHandler (WebReferenceCommands.UpdateAll)]
void CanUpdateWebReferences (CommandInfo ci)
{
// This does not appear to work.
@@ -67,14 +64,14 @@ void CanUpdateWebReferences (CommandInfo ci)
}
/// <summary>Execute the command for updating a web reference in a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Update)]
+ [CommandHandler (WebReferenceCommands.Update)]
public void Update()
{
UpdateReferences (new [] { (WebReferenceItem) CurrentNode.DataItem });
}
/// <summary>Execute the command for updating all web reference in a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.UpdateAll)]
+ [CommandHandler (WebReferenceCommands.UpdateAll)]
public void UpdateAll()
{
DotNetProject project = ((WebReferenceFolder) CurrentNode.DataItem).Project;
@@ -125,7 +122,7 @@ void DisposeUpdateContext ()
}
/// <summary>Execute the command for removing a web reference from a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Delete)]
+ [CommandHandler (WebReferenceCommands.Delete)]
public void Delete()
{
WebReferenceItem item = (WebReferenceItem) CurrentNode.DataItem;
@@ -137,7 +134,7 @@ public void Delete()
}
/// <summary>Execute the command for removing all web references from a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.DeleteAll)]
+ [CommandHandler (WebReferenceCommands.DeleteAll)]
public void DeleteAll()
{
DotNetProject project = ((WebReferenceFolder) CurrentNode.DataItem).Project;
@@ -149,7 +146,7 @@ public void DeleteAll()
IdeApp.Workbench.StatusBar.ShowMessage("Deleted all Web References");
}
- [CommandUpdateHandler (MonoDevelop.WebReferences.WebReferenceCommands.Configure)]
+ [CommandUpdateHandler (WebReferenceCommands.Configure)]
void CanConfigureWebReferences (CommandInfo ci)
{
var item = CurrentNode.DataItem as WebReferenceItem;
@@ -157,7 +154,7 @@ void CanConfigureWebReferences (CommandInfo ci)
}
/// <summary>Execute the command for configuring a web reference in a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Configure)]
+ [CommandHandler (WebReferenceCommands.Configure)]
public void Configure ()
{
var item = (WebReferenceItem) CurrentNode.DataItem;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommands.cs
===================================================================
@@ -1,4 +1,3 @@
-using System;
namespace MonoDevelop.WebReferences
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/UserPasswordDialog.cs
===================================================================
@@ -23,7 +23,6 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
using MonoDevelop.Core;
namespace MonoDevelop.WebReferences.Dialogs
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.WebReferences.Dialogs
{
[System.ComponentModel.ToolboxItem(true)]
- public partial class WCFConfigWidget : Gtk.Bin
+ public partial class WCFConfigWidget : Bin
{
public WCFConfigWidget (ClientOptions options)
{
@@ -53,17 +53,17 @@ public WCFConfigWidget (ClientOptions options)
static readonly Type[] DefaultListTypes = {
typeof (Array),
- typeof (System.Collections.Generic.LinkedList<>),
- typeof (System.Collections.Generic.List<>),
+ typeof (LinkedList<>),
+ typeof (List<>),
typeof (System.Collections.ObjectModel.Collection<>),
typeof (System.Collections.ObjectModel.ObservableCollection<>),
typeof (System.ComponentModel.BindingList<>)
};
static readonly Type[] DefaultDictionaryTypes = {
- typeof (System.Collections.Generic.Dictionary<,>),
- typeof (System.Collections.Generic.SortedList<,>),
- typeof (System.Collections.Generic.SortedDictionary<,>)
+ typeof (Dictionary<, >),
+ typeof (SortedList<, >),
+ typeof (SortedDictionary<, >)
};
public bool Modified {
@@ -71,8 +71,8 @@ public WCFConfigWidget (ClientOptions options)
private set;
}
- List<Type> listTypes;
- List<Type> dictTypes;
+ readonly List<Type> listTypes;
+ readonly List<Type> dictTypes;
static bool? runtimeSupport;
@@ -106,7 +106,7 @@ internal static Type GetType (string name)
var type = typeof (char).Assembly.GetType (name);
if (type != null)
return type;
- type = typeof (System.Collections.Generic.LinkedList<>).Assembly.GetType (name);
+ type = typeof (LinkedList<>).Assembly.GetType (name);
if (type != null)
return type;
return null;
@@ -115,7 +115,7 @@ internal static Type GetType (string name)
internal static string GetTypeName (Type type)
{
var name = type.FullName;
- var pos = name.IndexOf ("`");
+ var pos = name.IndexOf ("`", StringComparison.Ordinal);
if (pos < 0)
return name;
return name.Substring (0, pos);
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
===================================================================
@@ -18,11 +18,11 @@
namespace MonoDevelop.WebReferences.Dialogs
{
- internal partial class WebReferenceDialog : Gtk.Dialog
+ internal partial class WebReferenceDialog : Dialog
{
#region Widgets
- protected Widget browserWidget = null;
- protected IWebBrowser browser = null;
+ protected Widget browserWidget;
+ protected IWebBrowser browser;
#endregion
enum DialogState {
@@ -36,10 +36,10 @@ enum DialogState {
bool modified;
bool isWebService;
WCFConfigWidget wcfConfig;
- ClientOptions wcfOptions;
+ readonly ClientOptions wcfOptions;
DialogState state = DialogState.Uninitialized;
Label docLabel;
- DotNetProject project;
+ readonly DotNetProject project;
#region Properties
/// <summary>Gets or Sets whether the current location of the browser is a valid web service or not.</summary>
@@ -52,7 +52,7 @@ private set
// Clear out the Reference and Namespace Entry
if (isWebService && !value)
{
- this.tbxReferenceName.Text = "";
+ tbxReferenceName.Text = "";
}
isWebService = value;
ChangeState (state);
@@ -88,11 +88,10 @@ public string DefaultReferenceName
{
get
{
- Uri discoveryUri = new Uri(this.ServiceUrl);
+ Uri discoveryUri = new Uri (ServiceUrl);
if (discoveryUri != null)
return MakeValidId (discoveryUri.Host);
- else
- return String.Empty;
+ return String.Empty;
}
}
@@ -104,8 +103,7 @@ string MakeValidId (string name)
if (char.IsNumber (c) && isWordStart) {
if (n == 0)
return "n" + name.Replace ('.','_');
- else
- return name.Replace ('.','_');
+ return name.Replace ('.','_');
}
isWordStart = c == '.';
}
@@ -116,14 +114,14 @@ string MakeValidId (string name)
/// <value>A string containing the name for the web reference.</value>
public string ReferenceName
{
- get { return this.tbxReferenceName.Text; }
+ get { return tbxReferenceName.Text; }
}
/// <summary>Gets the namespace for the web reference.</summary>
/// <value>A string containing the namespace for the web refrence.</value>
public string Namespace
{
- get { return this.tbxNamespace.Text; }
+ get { return tbxNamespace.Text; }
}
/// <summary>Gets the selected service discovery result.</summary>
@@ -154,18 +152,18 @@ public string ReferencePath
#endregion
#region Member Variables
- private string homeUrl = "http://www.w3schools.com/WebServices/TempConvert.asmx";
- private string serviceUrl = "";
- private string namespacePrefix = "";
- private WebServiceDiscoveryResult selectedService;
- private string basePath = "";
+ const string homeUrl = "http://www.w3schools.com/WebServices/TempConvert.asmx";
+ string serviceUrl = "";
+ string namespacePrefix = "";
+ WebServiceDiscoveryResult selectedService;
+ string basePath = "";
// protected Gtk.Alignment frmBrowserAlign;
#endregion
/// <summary>Initializes a new instance of the AddWebReferenceDialog widget.</summary>
public WebReferenceDialog (DotNetProject project)
{
- Build();
+ Build ();
this.basePath = Library.GetWebReferencePath (project);
this.isWebService = false;
this.project = project;
@@ -225,7 +223,7 @@ public WebReferenceDialog (WebReferenceItem item, ClientOptions options)
// }
// }
- private void Browser_GoButtonClicked (object sender, EventArgs e)
+ void Browser_GoButtonClicked (object sender, EventArgs e)
{
modified = true;
switch (state) {
@@ -252,7 +250,7 @@ private void Browser_GoButtonClicked (object sender, EventArgs e)
/// <summary>Execute the event when the Enter key has been pressed on the Url Entry</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_URLKeyReleased (object sender, Gtk.KeyReleaseEventArgs e)
+ void Browser_URLKeyReleased (object sender, KeyReleaseEventArgs e)
{
if (e.Event.Key == Gdk.Key.Return)
{
@@ -264,87 +262,87 @@ private void Browser_URLKeyReleased (object sender, Gtk.KeyReleaseEventArgs e)
/// <summary>Execute the event when the Location of the Browser has changed</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_LocationChanged (object sender, EventArgs e)
+ void Browser_LocationChanged (object sender, EventArgs e)
{
if (browser != null) {
- this.tbxReferenceURL.Text = this.browser.Location;
- this.btnNavBack.Sensitive = browser.CanGoBack;
- this.btnNavNext.Sensitive = browser.CanGoForward;
+ tbxReferenceURL.Text = browser.Location;
+ btnNavBack.Sensitive = browser.CanGoBack;
+ btnNavNext.Sensitive = browser.CanGoForward;
// Query the current url for services
- ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), this.tbxReferenceURL.Text);
+ ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
}
void UpdateLocation ()
{
- ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), this.tbxReferenceURL.Text);
+ ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
/// <summary>Execute when the browser starts loading a document</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_StartLoading (object sender, EventArgs e)
+ void Browser_StartLoading (object sender, EventArgs e)
{
- this.btnStop.Sensitive = true;
+ btnStop.Sensitive = true;
}
/// <summary>Execute the browser stop loading a document</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_StopLoading (object sender, EventArgs e)
+ void Browser_StopLoading (object sender, EventArgs e)
{
- this.btnStop.Sensitive = false;
+ btnStop.Sensitive = false;
}
/// <summary>Execute when the Back button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_BackButtonClicked (object sender, EventArgs e)
+ void Browser_BackButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.GoBack();
+ browser.GoBack();
}
/// <summary>Execute when the Next button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_NextButtonClicked (object sender, EventArgs e)
+ void Browser_NextButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.GoForward();
+ browser.GoForward();
}
/// <summary>Execute when the Refresh button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_RefreshButtonClicked (object sender, EventArgs e)
+ void Browser_RefreshButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.Reload();
+ browser.Reload();
}
/// <summary>Execute when the Stop button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_StopButtonClicked (object sender, EventArgs e)
+ void Browser_StopButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.StopLoad();
+ browser.StopLoad();
}
/// <summary>Execute when the Home button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_HomeButtonClicked (object sender, EventArgs e)
+ void Browser_HomeButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.LoadUrl(this.homeUrl);
+ browser.LoadUrl(homeUrl);
}
/// <summary>Queries the web service to validate that the current url contains services</summary>
/// <param name="param">An object that contains the parameter being passed from the ThreadPool.</param>
- private void QueryService (object param)
+ void QueryService (object param)
{
string url = param as string;
// Set the service url
@@ -368,8 +366,8 @@ private void QueryService (object param)
service = serviceEngine.Discover (url);
} catch (Exception ex) {
serviceUrl = null;
- this.IsWebService = false;
- this.selectedService = null;
+ IsWebService = false;
+ selectedService = null;
LoggingService.LogError ("Error while discovering web services", ex);
ShowError (ex.Message);
return;
@@ -396,14 +394,14 @@ void UpdateService (WebServiceDiscoveryResult service, string url)
StringBuilder text = new StringBuilder ();
if (service == null) {
- this.IsWebService = false;
- this.selectedService = null;
+ IsWebService = false;
+ selectedService = null;
} else {
// Set the Default Namespace and Reference
- this.tbxNamespace.Text = this.DefaultNamespace;
+ tbxNamespace.Text = DefaultNamespace;
if (project != null) {
- string name = this.DefaultReferenceName;
+ string name = DefaultReferenceName;
var items = WebReferencesService.GetWebReferenceItems (project);
if (items.Any (it => it.Name == name)) {
@@ -412,11 +410,11 @@ void UpdateService (WebServiceDiscoveryResult service, string url)
num++;
name = name + "_" + num;
}
- this.tbxReferenceName.Text = name;
+ tbxReferenceName.Text = name;
}
- this.IsWebService = true;
- this.selectedService = service;
+ IsWebService = true;
+ selectedService = service;
if (docLabel != null) {
docLabel.Wrap = false;
@@ -433,7 +431,7 @@ void UpdateService (WebServiceDiscoveryResult service, string url)
return;
}
- protected virtual void OnBtnOKClicked (object sender, System.EventArgs e)
+ protected virtual void OnBtnOKClicked (object sender, EventArgs e)
{
if (wcfConfig != null) {
wcfConfig.Update ();
@@ -441,12 +439,12 @@ protected virtual void OnBtnOKClicked (object sender, System.EventArgs e)
}
if (project == null) {
- Respond (Gtk.ResponseType.Ok);
+ Respond (ResponseType.Ok);
return;
}
- if (WebReferencesService.GetWebReferenceItems (project).Any (r => r.Name == this.tbxReferenceName.Text)) {
- MessageService.ShowError (GettextCatalog.GetString ("Web reference already exists"), GettextCatalog.GetString ("A web service reference with the name '{0}' already exists in the project. Please use a different name.", this.tbxReferenceName.Text));
+ if (WebReferencesService.GetWebReferenceItems (project).Any (r => r.Name == tbxReferenceName.Text)) {
+ MessageService.ShowError (GettextCatalog.GetString ("Web reference already exists"), GettextCatalog.GetString ("A web service reference with the name '{0}' already exists in the project. Please use a different name.", tbxReferenceName.Text));
return;
}
@@ -456,13 +454,13 @@ protected virtual void OnBtnOKClicked (object sender, System.EventArgs e)
return;
}
- Respond (Gtk.ResponseType.Ok);
+ Respond (ResponseType.Ok);
}
- protected virtual void OnComboModelChanged (object sender, System.EventArgs e)
+ protected virtual void OnComboModelChanged (object sender, EventArgs e)
{
serviceUrl = null;
- ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), this.tbxReferenceURL.Text);
+ ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
protected void OnBtnConfigClicked (object sender, EventArgs e)
@@ -614,9 +612,9 @@ protected void OnBtnBackClicked (object sender, EventArgs e)
class AskCredentials: GuiSyncObject, ICredentials
{
- static Dictionary<string,NetworkCredential> credentials = new Dictionary<string, NetworkCredential> ();
+ static readonly Dictionary<string,NetworkCredential> credentials = new Dictionary<string, NetworkCredential> ();
- Dictionary<string,NetworkCredential> tempCredentials = new Dictionary<string, NetworkCredential> ();
+ readonly Dictionary<string,NetworkCredential> tempCredentials = new Dictionary<string, NetworkCredential> ();
public bool Canceled;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
===================================================================
@@ -1,6 +1,4 @@
using System;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
using MonoDevelop.Ide.Gui.Pads.ProjectPad;
using MonoDevelop.Projects;
using MonoDevelop.Ide.Gui.Components;
@@ -20,15 +18,18 @@ public override bool CanBuildNode (Type dataType)
}
/// <summary>Get the attributes for the current node.</summary>
- /// <param name="treeNavigator">ITreeNavigator containing the tree navigator.</param>
+ /// <param name="parentNode">ITreeNavigator containing the tree navigator.</param>
/// <param name="dataObject">An object containing the value of the current node.</param>
/// <param name="attributes">A NodeAttributes reference containing all the attribute for the current node.</param>
- public override void GetNodeAttributes (ITreeNavigator treeNavigator, object dataObject, ref NodeAttributes attributes)
+ public override void GetNodeAttributes (ITreeNavigator parentNode, object dataObject, ref NodeAttributes attributes)
{
- if (treeNavigator.Options ["ShowAllFiles"])
+ if (parentNode.Options ["ShowAllFiles"])
return;
ProjectFolder folder = dataObject as ProjectFolder;
+ if (folder == null)
+ return;
+
DotNetProject project = folder.Project as DotNetProject;
if (project == null)
return;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
===================================================================
@@ -1,10 +1,6 @@
using System;
using System.Linq;
-using System.Collections;
using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.WebReferences.Commands;
using MonoDevelop.Ide.Gui.Components;
@@ -41,14 +37,14 @@ public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
return WebReferencesService.GetWebReferenceItems (project).Any ();
}
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+ public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
DotNetProject project = (DotNetProject) dataObject;
if (WebReferencesService.GetWebReferenceItems (project).Any ())
- builder.AddChild (new WebReferenceFolder (project));
+ treeBuilder.AddChild (new WebReferenceFolder (project));
}
- void HandleWebReferencesServiceWebReferencesChanged (object sender, WebReferencesChangedArgs e)
+ void HandleWebReferencesServiceWebReferencesChanged (object sender, WebReferencesChangedEventArgs e)
{
ITreeBuilder builder = Context.GetTreeBuilder (e.Project);
if (builder != null)
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
===================================================================
@@ -4,7 +4,6 @@
using MonoDevelop.Ide.Gui;
using MonoDevelop.WebReferences.Commands;
using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
namespace MonoDevelop.WebReferences.NodeBuilders
{
@@ -65,13 +64,13 @@ public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
}
/// <summary>Add entries for all the web references in the project to the tree builder.</summary>
- /// <param name="builder">An ITreeBuilder containing all the data for the current DotNet project.</param>
+ /// <param name="treeBuilder">An ITreeBuilder containing all the data for the current DotNet project.</param>
/// <param name="dataObject">An object containing the data for the current node in the tree.</param>
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+ public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
WebReferenceFolder folder = (WebReferenceFolder) dataObject;
foreach (WebReferenceItem item in WebReferencesService.GetWebReferenceItems (folder.Project))
- builder.AddChild(item);
+ treeBuilder.AddChild(item);
}
/// <summary>Compare two object with one another and returns a number based on their sort order.</summary>
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
===================================================================
@@ -1,14 +1,5 @@
using System;
-using System.IO;
-using System.Collections;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Pads;
using MonoDevelop.WebReferences.Commands;
using MonoDevelop.Ide.Gui.Components;
@@ -70,9 +61,9 @@ public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
}
/// <summary>Add entries for all the web references in the project to the tree builder.</summary>
- /// <param name="builder">An ITreeBuilder containing all the data for the current DotNet project.</param>
+ /// <param name="treeBuilder">An ITreeBuilder containing all the data for the current DotNet project.</param>
/// <param name="dataObject">An object containing the data for the current node in the tree.</param>
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+ public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
/*
WebReferenceItem item = (WebReferenceItem) dataObject;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ClientOptions.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
using System.Collections.Generic;
namespace MonoDevelop.WebReferences.WCF
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/CollectionMapping.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ExtensionFile.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataFile.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataSource.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferenceGroup.cs
===================================================================
@@ -35,8 +35,8 @@ namespace MonoDevelop.WebReferences.WCF
public class ReferenceGroup
{
ClientOptions options = new ClientOptions ();
- List<MetadataSource> sources = new List<MetadataSource> ();
- List<MetadataFile> metadata = new List<MetadataFile> ();
+ readonly List<MetadataSource> sources = new List<MetadataSource> ();
+ readonly List<MetadataFile> metadata = new List<MetadataFile> ();
[XmlAttribute]
public string ID { get; set; }
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferencedAssembly.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
===================================================================
@@ -48,7 +48,7 @@ class WebServiceDiscoveryResultWCF: WebServiceDiscoveryResult
MetadataSet metadata;
DiscoveryClientProtocol protocol;
ReferenceGroup refGroup;
- ClientOptions defaultOptions;
+ readonly ClientOptions defaultOptions;
public WebServiceDiscoveryResultWCF (DiscoveryClientProtocol protocol, MetadataSet metadata, WebReferenceItem item, ReferenceGroup refGroup, ClientOptions defaultOptions): base (WebReferencesService.WcfEngine, item)
{
@@ -76,7 +76,8 @@ public override string GetDescriptionMarkup ()
if (dd is ServiceDescription) {
Library.GenerateWsdlXml (text, protocol);
break;
- } else if (dd is DiscoveryDocument) {
+ }
+ if (dd is DiscoveryDocument) {
Library.GenerateDiscoXml (text, (DiscoveryDocument)dd);
break;
}
@@ -93,17 +94,17 @@ public override string GetDescriptionMarkup ()
}
}
- protected override string GenerateDescriptionFiles (DotNetProject project, FilePath basePath)
+ protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
{
- if (!project.Items.GetAll<WCFMetadata> ().Any ()) {
+ if (!dotNetProject.Items.GetAll<WCFMetadata> ().Any ()) {
WCFMetadata met = new WCFMetadata ();
met.Path = basePath.ParentDirectory;
- project.Items.Add (met);
+ dotNetProject.Items.Add (met);
}
- WCFMetadataStorage metStor = project.Items.GetAll<WCFMetadataStorage> ().FirstOrDefault (m => m.Path.CanonicalPath == basePath);
+ WCFMetadataStorage metStor = dotNetProject.Items.GetAll<WCFMetadataStorage> ().FirstOrDefault (m => m.Path.CanonicalPath == basePath);
if (metStor == null)
- project.Items.Add (new WCFMetadataStorage () { Path = basePath });
+ dotNetProject.Items.Add (new WCFMetadataStorage { Path = basePath });
string file = Path.Combine (basePath, "Reference.svcmap");
if (protocol != null) {
@@ -119,7 +120,7 @@ protected override string GenerateDescriptionFiles (DotNetProject project, FileP
refGroup = map;
}
foreach (MetadataFile mfile in refGroup.Metadata)
- project.AddFile (new FilePath (mfile.FileName).ToAbsolute (basePath), BuildAction.None);
+ dotNetProject.AddFile (new FilePath (mfile.FileName).ToAbsolute (basePath), BuildAction.None);
return file;
}
@@ -139,7 +140,7 @@ public override void Update ()
GenerateFiles (Item.Project, Item.Project.DefaultNamespace, Item.Name);
}
- public override System.Collections.Generic.IEnumerable<string> GetAssemblyReferences ()
+ public override IEnumerable<string> GetAssemblyReferences ()
{
yield return "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
yield return "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
@@ -187,7 +188,6 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
try {
ConfigureImporter (importer);
} catch {
- ;
}
Collection<ContractDescription> contracts = importer.ImportAllContracts ();
@@ -285,13 +285,13 @@ ReferenceGroup ConvertMapFile (string mapFile)
return map;
}
- MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
+ static MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
{
MetadataSet metadata = new MetadataSet ();
foreach (object o in prot.Documents.Values) {
if (o is System.Web.Services.Description.ServiceDescription) {
metadata.MetadataSections.Add (
- new MetadataSection (MetadataSection.ServiceDescriptionDialect, "", (System.Web.Services.Description.ServiceDescription) o));
+ new MetadataSection (MetadataSection.ServiceDescriptionDialect, "", (ServiceDescription) o));
}
if (o is XmlSchema) {
metadata.MetadataSections.Add (
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.WebReferences.WCF
{
public class WebServiceEngineWCF: WebServiceEngine
{
- ClientOptions defaultOptions = new ClientOptions ();
+ readonly ClientOptions defaultOptions = new ClientOptions ();
public ClientOptions DefaultClientOptions {
get { return defaultOptions; }
@@ -117,13 +117,13 @@ public override WebServiceDiscoveryResult Load (WebReferenceItem item)
DiscoveryReference dr;
switch (dcr.MetadataType) {
case "Wsdl":
- dr = new System.Web.Services.Discovery.ContractReference ();
+ dr = new ContractReference ();
break;
case "Disco":
- dr = new System.Web.Services.Discovery.DiscoveryDocumentReference ();
+ dr = new DiscoveryDocumentReference ();
break;
case "Schema":
- dr = new System.Web.Services.Discovery.SchemaReference ();
+ dr = new SchemaReference ();
break;
default:
continue;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
===================================================================
@@ -24,7 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
using MonoDevelop.Projects;
using MonoDevelop.Core.Serialization;
using MonoDevelop.Core;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
===================================================================
@@ -34,7 +34,6 @@
using System.CodeDom;
using MonoDevelop.Core;
using WebReferencesDir = MonoDevelop.WebReferences.WS.WebReferences;
-using System.Collections.Generic;
namespace MonoDevelop.WebReferences.WS
{
@@ -48,7 +47,7 @@ public WebServiceDiscoveryResultWS (DiscoveryClientProtocol protocol, WebReferen
}
public DiscoveryClientProtocol Protocol {
- get { return this.protocol; }
+ get { return protocol; }
}
public override FilePath GetReferencePath (DotNetProject project, string refName)
@@ -63,7 +62,8 @@ public override string GetDescriptionMarkup ()
if (dd is ServiceDescription) {
Library.GenerateWsdlXml (text, protocol);
break;
- } else if (dd is DiscoveryDocument) {
+ }
+ if (dd is DiscoveryDocument) {
Library.GenerateDiscoXml (text, (DiscoveryDocument)dd);
break;
}
@@ -77,26 +77,26 @@ public override string GetDescriptionMarkup ()
}
}
- protected override string GenerateDescriptionFiles (DotNetProject project, FilePath basePath)
+ protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
{
- if (!project.Items.GetAll<WebReferencesDir> ().Any ()) {
+ if (!dotNetProject.Items.GetAll<WebReferencesDir> ().Any ()) {
WebReferencesDir met = new WebReferencesDir ();
met.Path = basePath.ParentDirectory;
- project.Items.Add (met);
+ dotNetProject.Items.Add (met);
}
- WebReferenceUrl wru = project.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == basePath);
+ WebReferenceUrl wru = dotNetProject.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == basePath);
if (wru == null) {
wru = new WebReferenceUrl (protocol.Url);
wru.RelPath = basePath;
- project.Items.Add (wru);
+ dotNetProject.Items.Add (wru);
}
protocol.ResolveAll ();
DiscoveryClientResultCollection files = protocol.WriteAll (basePath, "Reference.map");
foreach (DiscoveryClientResult dr in files)
- project.AddFile (new FilePath (dr.Filename).ToAbsolute (basePath), BuildAction.None);
+ dotNetProject.AddFile (new FilePath (dr.Filename).ToAbsolute (basePath), BuildAction.None);
return Path.Combine (basePath, "Reference.map");
}
@@ -143,7 +143,7 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
if (declarationType.IsClass)
if (declarationType.BaseTypes.Count > 0)
// Is a Service Class
- if (declarationType.BaseTypes [0].BaseType.IndexOf ("SoapHttpClientProtocol") > -1) {
+ if (declarationType.BaseTypes [0].BaseType.IndexOf ("SoapHttpClientProtocol", System.StringComparison.Ordinal) > -1) {
// Create new public constructor with the Url as parameter
urlConstructor.Attributes = MemberAttributes.Public;
urlConstructor.Parameters.Add (new CodeParameterDeclarationExpression ("System.String", "url"));
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
===================================================================
@@ -43,8 +43,7 @@ public override WebServiceDiscoveryResult Discover (string url)
protocol.Url = url;
return new WebServiceDiscoveryResultWS (protocol, null);
}
- else
- return null;
+ return null;
}
public override WebServiceDiscoveryResult Load (WebReferenceItem item)
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryNetworkCredential.cs
===================================================================
@@ -15,7 +15,7 @@ public string AuthenticationType
public bool IsDefaultAuthenticationType
{
- get { return String.Compare(authenticationType, DefaultAuthenticationType, true) == 0; }
+ get { return String.Compare (authenticationType, DefaultAuthenticationType, StringComparison.OrdinalIgnoreCase) == 0; }
}
#endregion
@@ -24,7 +24,7 @@ public bool IsDefaultAuthenticationType
#endregion
#region Member Variables
- string authenticationType = String.Empty;
+ readonly string authenticationType = String.Empty;
#endregion
public DiscoveryNetworkCredential(string userName, string password, string domain, string authenticationType) : base(userName, password, domain)
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
===================================================================
@@ -7,7 +7,7 @@ namespace MonoDevelop.WebReferences
{
/// <summary>Provides support for programmatically invoking XML Web services discovery.</summary>
[System.ComponentModel.DesignerCategory ("Code")]
- public class DiscoveryProtocol : System.Web.Services.Discovery.DiscoveryClientProtocol
+ public class DiscoveryProtocol : DiscoveryClientProtocol
{
/// <summary>
/// Reads in a file containing a map of saved discovery documents populating the Documents and References properties,
@@ -30,14 +30,14 @@ public DiscoveryClientResultCollection ReadAllUseBasePath(string topLevelFilenam
foreach (DiscoveryClientResult dcr in resfile.Results)
{
// Done this cause Type.GetType(dcr.ReferenceTypeName) returned null
- Type type = null;
+ Type type;
switch (dcr.ReferenceTypeName)
{
case "System.Web.Services.Discovery.ContractReference":
- type = typeof(System.Web.Services.Discovery.ContractReference);
+ type = typeof(ContractReference);
break;
case "System.Web.Services.Discovery.DiscoveryDocumentReference":
- type = typeof(System.Web.Services.Discovery.DiscoveryDocumentReference);
+ type = typeof(DiscoveryDocumentReference);
break;
default:
continue;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
===================================================================
@@ -5,7 +5,6 @@
using System.Net;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
-using System.Xml;
using System.Xml.Schema;
using MonoDevelop.Projects;
using MonoDevelop.Core;
@@ -14,7 +13,7 @@
namespace MonoDevelop.WebReferences
{
/// <summary>A Library class containig generic static methods for Web Services.</summary>
- public class Library
+ public static class Library
{
/// <summary>Read the service description for a specified uri.</summary>
/// <param name="uri">A string containing the unique reference identifier for the service.</param>
@@ -68,7 +67,7 @@ public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
if (dref == null)
continue;
if (dref is ContractReference) {
- text.AppendFormat ("<b>Service: {0}</b>\n<span size='small'>{1}</span>", System.IO.Path.GetFileNameWithoutExtension (dref.DefaultFilename), dref.Url);
+ text.AppendFormat ("<b>Service: {0}</b>\n<span size='small'>{1}</span>", Path.GetFileNameWithoutExtension (dref.DefaultFilename), dref.Url);
}
else if (dref is DiscoveryDocumentReference) {
text.AppendFormat ("<b>Discovery document</b>\n<small>{0}</small>", dref.Url);
@@ -109,16 +108,16 @@ public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol
// Method
// Asynch Begin & End Results
string returnType = met.ReturnType.BaseType;
- if (met.Name.StartsWith ("Begin") && returnType == "System.IAsyncResult")
+ if (met.Name.StartsWith ("Begin", StringComparison.Ordinal) && returnType == "System.IAsyncResult")
continue; // BeginXXX method
- if (met.Name.EndsWith ("Async"))
+ if (met.Name.EndsWith ("Async", StringComparison.Ordinal))
continue;
- if (met.Name.StartsWith ("On") && met.Name.EndsWith ("Completed"))
+ if (met.Name.StartsWith ("On", StringComparison.Ordinal) && met.Name.EndsWith ("Completed", StringComparison.Ordinal))
continue;
if (met.Parameters.Count > 0)
{
CodeParameterDeclarationExpression par = met.Parameters [met.Parameters.Count-1];
- if (met.Name.StartsWith ("End") && par.Type.BaseType == "System.IAsyncResult")
+ if (met.Name.StartsWith ("End", StringComparison.Ordinal) && par.Type.BaseType == "System.IAsyncResult")
continue; // EndXXX method
}
text.AppendFormat ("<b>{0}</b> (", met.Name);
@@ -156,10 +155,7 @@ public static string GetCommentElements (CodeTypeMember member)
if (com.Length > 0)
coms.Append (com);
}
- if (coms.Length > 0)
- return coms.ToString ();
- else
- return null;
+ return coms.Length > 0 ? coms.ToString () : null;
}
/// <summary>Gets the path where all web references will be stored for the specified project.</summary>
@@ -170,8 +166,7 @@ public static FilePath GetWebReferencePath (Project project)
FilePath fp = project.BaseDirectory.Combine ("WebReferences");
if (Directory.Exists (fp))
return fp;
- else
- return project.BaseDirectory.Combine ("Web References");
+ return project.BaseDirectory.Combine ("Web References");
}
/// <summary>Checks whether or not the current project does contain any web references.</summary>
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
===================================================================
@@ -27,17 +27,11 @@
//
using System;
using System.CodeDom;
-using System.CodeDom.Compiler;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
using System.Reflection;
-using System.ServiceModel;
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
using System.ServiceModel.Dispatcher;
-using System.Threading;
namespace Mono.ServiceContractTool
{
@@ -83,8 +77,8 @@ public MoonlightChannelBaseContractExtension (MoonlightChannelBaseContext mlCont
generate_sync = generateSync;
}
- MoonlightChannelBaseContext ml_context;
- bool generate_sync;
+ readonly MoonlightChannelBaseContext ml_context;
+ readonly bool generate_sync;
// IContractBehavior
public void AddBindingParameters (ContractDescription contractDescription, ServiceEndpoint endpoint, BindingParameterCollection bindingParameters)
@@ -165,7 +159,9 @@ public void Fixup ()
// protected override TChannel CreateChannel()
var creator = new CodeMemberMethod ();
creator.Name = "CreateChannel";
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
creator.Attributes = MemberAttributes.Family | MemberAttributes.Override;
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
creator.ReturnType = gt;
creator.Statements.Add (
new CodeMethodReturnStatement (
@@ -199,7 +195,7 @@ public void Fixup ()
}
}
- bool ShouldPreserveBaseTypes (CodeTypeDeclaration ct)
+ static bool ShouldPreserveBaseTypes (CodeTypeDeclaration ct)
{
foreach (CodeTypeReference cr in ct.BaseTypes) {
if (cr.BaseType == "System.ServiceModel.ClientBase`1")
@@ -279,8 +275,8 @@ public MoonlightChannelBaseOperationExtension (MoonlightChannelBaseContext mlCon
generate_sync = generateSync;
}
- MoonlightChannelBaseContext ml_context;
- bool generate_sync;
+ readonly MoonlightChannelBaseContext ml_context;
+ readonly bool generate_sync;
// IOperationBehavior
@@ -337,8 +333,10 @@ void FixupSync ()
CodeMemberMethod cm = new CodeMemberMethod ();
type.Members.Add (cm);
cm.Name = od.Name;
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
cm.Attributes = MemberAttributes.Public
| MemberAttributes.Final;
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
var inArgs = new List<CodeParameterDeclarationExpression > ();
@@ -379,9 +377,11 @@ public void FixupAsync ()
var asyncResultType = new CodeTypeReference (typeof (IAsyncResult));
// BeginXxx() implementation
- CodeMemberMethod cm = new CodeMemberMethod () {
+ CodeMemberMethod cm = new CodeMemberMethod {
Name = "Begin" + od.Name,
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
Attributes = MemberAttributes.Public | MemberAttributes.Final,
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
ReturnType = asyncResultType
};
type.Members.Add (cm);
@@ -405,9 +405,11 @@ public void FixupAsync ()
// EndXxx() implementation
- cm = new CodeMemberMethod () {
+ cm = new CodeMemberMethod {
Name = "End" + od.Name,
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
Attributes = MemberAttributes.Public | MemberAttributes.Final,
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
ReturnType = context.EndMethod.ReturnType };
type.Members.Add (cm);
@@ -434,7 +436,7 @@ public void FixupAsync ()
cm.Statements.Add (new CodeMethodReturnStatement (new CodeCastExpression (context.EndMethod.ReturnType, ret)));
}
- void AddMethodParam (CodeMemberMethod cm, Type type, string name)
+ static void AddMethodParam (CodeMemberMethod cm, Type type, string name)
{
cm.Parameters.Add (new CodeParameterDeclarationExpression (new CodeTypeReference (type), name));
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
===================================================================
@@ -1,4 +1,3 @@
-using System;
using MonoDevelop.Projects;
namespace MonoDevelop.WebReferences
@@ -16,7 +15,7 @@ public DotNetProject Project
#endregion
#region Member Variables
- private DotNetProject project;
+ readonly DotNetProject project;
#endregion
/// <summary>Initializes a new instance of the WebReferenceFolder class by specifying the parent project.</summary>
@@ -27,12 +26,11 @@ public WebReferenceFolder (DotNetProject project)
}
/// <summary>Checks if the specified other object is equal to the current object.</summary>
- /// <param name="other">An object containing the object that needs to be compared to the current object.</param>
+ /// <param name="obj">An object containing the object that needs to be compared to the current object.</param>
/// <returns>True of the other object is equal to the current object, otherwise false.</returns>
- public override bool Equals (object other)
+ public override bool Equals (object obj)
{
-
- WebReferenceFolder folder = other as WebReferenceFolder;
+ WebReferenceFolder folder = obj as WebReferenceFolder;
return folder != null && project == folder.project;
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
===================================================================
@@ -1,18 +1,5 @@
-using System;
-using System.Collections;
-using System.IO;
-using System.Linq;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using System.Net;
-using System.Text.RegularExpressions;
-
using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
using MonoDevelop.Core;
-using System.Collections.Generic;
namespace MonoDevelop.WebReferences
@@ -20,10 +7,10 @@ namespace MonoDevelop.WebReferences
/// <summary>Defines the properties and methods for the WebReferenceItem class.</summary>
public class WebReferenceItem
{
- DotNetProject project;
+ readonly DotNetProject project;
string name;
- ProjectFile mapFile;
- WebServiceEngine engine;
+ readonly ProjectFile mapFile;
+ readonly WebServiceEngine engine;
public string Name
{
@@ -32,13 +19,13 @@ public string Name
}
public ProjectFile MapFile {
- get { return this.mapFile; }
+ get { return mapFile; }
}
public FilePath BasePath { get; private set; }
public DotNetProject Project {
- get { return this.project; }
+ get { return project; }
}
/// <summary>Initializes a new instance of the WebReferenceItem class.</summary>
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
===================================================================
@@ -26,7 +26,6 @@
using System;
using MonoDevelop.Projects;
-using MonoDevelop.Core;
using System.Collections.Generic;
using MonoDevelop.WebReferences.WCF;
using MonoDevelop.WebReferences.WS;
@@ -53,29 +52,29 @@ public static void NotifyWebReferencesChanged (DotNetProject project)
// this event and just ensure we proxy it to the main thread.
if (MonoDevelop.Ide.DispatchService.IsGuiThread) {
if (WebReferencesChanged != null)
- WebReferencesChanged (null, new WebReferencesChangedArgs (project));
+ WebReferencesChanged (null, new WebReferencesChangedEventArgs (project));
} else {
MonoDevelop.Ide.DispatchService.GuiDispatch (() => {
if (WebReferencesChanged != null)
- WebReferencesChanged (null, new WebReferencesChangedArgs (project));
+ WebReferencesChanged (null, new WebReferencesChangedEventArgs (project));
});
}
}
- public static event EventHandler<WebReferencesChangedArgs> WebReferencesChanged;
+ public static event EventHandler<WebReferencesChangedEventArgs> WebReferencesChanged;
}
- public class WebReferencesChangedArgs: EventArgs
+ public class WebReferencesChangedEventArgs: EventArgs
{
- DotNetProject project;
+ readonly DotNetProject project;
- public WebReferencesChangedArgs (DotNetProject project)
+ public WebReferencesChangedEventArgs (DotNetProject project)
{
this.project = project;
}
public DotNetProject Project {
- get { return this.project; }
+ get { return project; }
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
===================================================================
@@ -36,7 +36,7 @@ namespace MonoDevelop.WebReferences
public abstract class WebServiceDiscoveryResult
{
WebReferenceItem item;
- WebServiceEngine engine;
+ readonly WebServiceEngine engine;
public WebServiceDiscoveryResult (WebServiceEngine engine, WebReferenceItem item)
{
@@ -45,7 +45,7 @@ public WebServiceDiscoveryResult (WebServiceEngine engine, WebReferenceItem item
}
public WebReferenceItem Item {
- get { return this.item; }
+ get { return item; }
}
CodeDomProvider provider;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
===================================================================
@@ -66,8 +66,8 @@ protected DiscoveryClientProtocol DiscoResolve (string url)
if (!creds.Canceled && wr != null && wr.StatusCode == HttpStatusCode.Unauthorized) {
unauthorized = true;
continue;
- } else
- throw;
+ }
+ throw;
}
} while (unauthorized);
Commit: d36562174e3b31606d9324721e633fb5d1fcd139
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-12 02:01:31 GMT
URL: https://github.com/mono/monodevelop/commit/d36562174e3b31606d9324721e633fb5d1fcd139
[WebReferences] Don't use lock (this).
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
===================================================================
@@ -340,14 +340,15 @@ void Browser_HomeButtonClicked (object sender, EventArgs e)
browser.LoadUrl(homeUrl);
}
+ readonly object queryLock = new object ();
/// <summary>Queries the web service to validate that the current url contains services</summary>
/// <param name="param">An object that contains the parameter being passed from the ThreadPool.</param>
void QueryService (object param)
{
string url = param as string;
// Set the service url
- lock (this) {
- if (serviceUrl == url)
+ lock (queryLock) {
+ if (serviceUrl == url)
return;
serviceUrl = url;
}
Commit: c17c003da1c3998fdae8d3bcbed6395b4e9100f9
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-12 02:01:31 GMT
URL: https://github.com/mono/monodevelop/commit/c17c003da1c3998fdae8d3bcbed6395b4e9100f9
[Web References] Implement other default types for list and dictionary.
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
===================================================================
@@ -53,6 +53,7 @@ public WCFConfigWidget (ClientOptions options)
static readonly Type[] DefaultListTypes = {
typeof (Array),
+ typeof (System.Collections.ArrayList),
typeof (LinkedList<>),
typeof (List<>),
typeof (System.Collections.ObjectModel.Collection<>),
@@ -63,7 +64,12 @@ public WCFConfigWidget (ClientOptions options)
static readonly Type[] DefaultDictionaryTypes = {
typeof (Dictionary<, >),
typeof (SortedList<, >),
- typeof (SortedDictionary<, >)
+ typeof (SortedDictionary<, >),
+ typeof (System.Collections.Hashtable),
+ typeof (System.Collections.SortedList),
+ typeof (System.Collections.Specialized.HybridDictionary),
+ typeof (System.Collections.Specialized.ListDictionary),
+ typeof (System.Collections.Specialized.OrderedDictionary)
};
public bool Modified {
Commit: 0fc3bf0fef67a25e98c8d8d6d444bc3198300f95
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-12 02:01:32 GMT
URL: https://github.com/mono/monodevelop/commit/0fc3bf0fef67a25e98c8d8d6d444bc3198300f95
[WebReferences] Made some methods static. Removed really useless null-check. :P
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
===================================================================
@@ -113,9 +113,7 @@ internal static Type GetType (string name)
if (type != null)
return type;
type = typeof (LinkedList<>).Assembly.GetType (name);
- if (type != null)
- return type;
- return null;
+ return type;
}
internal static string GetTypeName (Type type)
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
===================================================================
@@ -95,7 +95,7 @@ public string DefaultReferenceName
}
}
- string MakeValidId (string name)
+ static string MakeValidId (string name)
{
bool isWordStart = true;
for (int n=0; n<name.Length; n++) {
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
===================================================================
@@ -63,7 +63,7 @@ public override WebServiceDiscoveryResult Discover (string url)
return null;
}
- MetadataSet ResolveWithWSMex (string url)
+ static MetadataSet ResolveWithWSMex (string url)
{
MetadataSet metadata = null;
try {
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
===================================================================
@@ -94,7 +94,7 @@ public override void Delete (WebReferenceItem item)
}
- void ImportReferenceUrlItems (DotNetProject project)
+ static void ImportReferenceUrlItems (DotNetProject project)
{
FilePath refsDir = project.BaseDirectory.Combine ("Web References");
@@ -115,7 +115,7 @@ void ImportReferenceUrlItems (DotNetProject project)
}
}
- string GetUrl (FilePath mapPath)
+ static string GetUrl (FilePath mapPath)
{
DiscoveryProtocol protocol = new DiscoveryProtocol ();
protocol.ReadAllUseBasePath (mapPath);
Commit: c3f56d9092c74ace28dcfd3e80be8408b543b955
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-12 02:01:32 GMT
URL: https://github.com/mono/monodevelop/commit/c3f56d9092c74ace28dcfd3e80be8408b543b955
[WebReferences] var usage, autoproperty.
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
===================================================================
@@ -23,7 +23,7 @@ public class WebReferenceCommandHandler : NodeCommandHandler
public void NewWebReference()
{
// Get the project and project folder
- DotNetProject project = CurrentNode.GetParentDataItem (typeof(DotNetProject), true) as DotNetProject;
+ var project = CurrentNode.GetParentDataItem (typeof(DotNetProject), true) as DotNetProject;
// Check and switch the runtime environment for the current project
if (project.TargetFramework.Id == TargetFrameworkMoniker.NET_1_1)
@@ -32,14 +32,14 @@ public void NewWebReference()
question += "Web Service is not supported in this version.";
question += "Do you want switch the runtime environment for this project version 2.0 ?";
- AlertButton switchButton = new AlertButton ("_Switch to .NET2");
+ var switchButton = new AlertButton ("_Switch to .NET2");
if (MessageService.AskQuestion(question, AlertButton.Cancel, switchButton) == switchButton)
project.TargetFramework = Runtime.SystemAssemblyService.GetTargetFramework (TargetFrameworkMoniker.NET_2_0);
else
return;
}
- WebReferenceDialog dialog = new WebReferenceDialog (project);
+ var dialog = new WebReferenceDialog (project);
dialog.NamespacePrefix = project.DefaultNamespace;
try {
@@ -125,7 +125,7 @@ void DisposeUpdateContext ()
[CommandHandler (WebReferenceCommands.Delete)]
public void Delete()
{
- WebReferenceItem item = (WebReferenceItem) CurrentNode.DataItem;
+ var item = (WebReferenceItem) CurrentNode.DataItem;
if (!MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the web service reference '{0}'?", item.Name), AlertButton.Delete))
return;
item.Delete();
@@ -138,7 +138,7 @@ public void Delete()
public void DeleteAll()
{
DotNetProject project = ((WebReferenceFolder) CurrentNode.DataItem).Project;
- List<WebReferenceItem> items = new List<WebReferenceItem> (WebReferencesService.GetWebReferenceItems (project));
+ var items = new List<WebReferenceItem> (WebReferencesService.GetWebReferenceItems (project));
foreach (var item in items)
item.Delete();
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
===================================================================
@@ -120,9 +120,7 @@ internal static string GetTypeName (Type type)
{
var name = type.FullName;
var pos = name.IndexOf ("`", StringComparison.Ordinal);
- if (pos < 0)
- return name;
- return name.Substring (0, pos);
+ return pos < 0 ? name : name.Substring (0, pos);
}
void PopulateBox (ComboBox box, string category, List<Type> types)
@@ -144,7 +142,7 @@ void PopulateBox (ComboBox box, string category, List<Type> types)
box.Active = types.IndexOf (current);
}
- void UpdateBox (ComboBox box, string category, List<Type> types)
+ void UpdateBox (ComboBox box, string category, IList<Type> types)
{
var mapping = Options.CollectionMappings.FirstOrDefault (m => m.Category == category);
if (mapping == null) {
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
===================================================================
@@ -61,25 +61,23 @@ private set
/// <summary>Gets or Sets the current url for web service</summary>
/// <value>A string containing the url of the web service</value>
- public string ServiceUrl
- {
- get { return serviceUrl; }
- set { serviceUrl = value; }
+ public string ServiceUrl {
+ get;
+ set;
}
/// <summary>Gets or Sets the namespace prefix for the web service</summary>
/// <value>A string containing namespace prefix value for the web service</value>
- public string NamespacePrefix
- {
- get { return namespacePrefix; }
- set { namespacePrefix = value; }
+ public string NamespacePrefix {
+ get;
+ set;
}
/// <summary>Gets the default namespace for the web service based of the service url and namespace prefix</summary>
/// <value>A string containing default namespace for the web service</value>
public string DefaultNamespace
{
- get { return namespacePrefix; }
+ get { return NamespacePrefix; }
}
/// <summary>Gets the default reference name for the web service based of the service url</summary>
@@ -88,10 +86,8 @@ public string DefaultReferenceName
{
get
{
- Uri discoveryUri = new Uri (ServiceUrl);
- if (discoveryUri != null)
- return MakeValidId (discoveryUri.Host);
- return String.Empty;
+ var discoveryUri = new Uri (ServiceUrl);
+ return discoveryUri != null ? MakeValidId (discoveryUri.Host) : String.Empty;
}
}
@@ -132,10 +128,9 @@ public WebServiceDiscoveryResult SelectedService
/// <summary>Gets or Sets the the base path of the where the web reference.</summary>
/// <value>A string containing the base path where all the web references are stored in.</value>
- public string BasePath
- {
- get { return basePath; }
- set { basePath = value; }
+ public string BasePath {
+ get;
+ set;
}
/// <summary>Gets the the base path for the current reference.</summary>
@@ -153,10 +148,7 @@ public string ReferencePath
#region Member Variables
const string homeUrl = "http://www.w3schools.com/WebServices/TempConvert.asmx";
- string serviceUrl = "";
- string namespacePrefix = "";
WebServiceDiscoveryResult selectedService;
- string basePath = "";
// protected Gtk.Alignment frmBrowserAlign;
#endregion
@@ -164,10 +156,12 @@ public string ReferencePath
public WebReferenceDialog (DotNetProject project)
{
Build ();
- this.basePath = Library.GetWebReferencePath (project);
+ this.BasePath = Library.GetWebReferencePath (project);
this.isWebService = false;
this.project = project;
this.modified = true;
+ this.NamespacePrefix = String.Empty;
+ ServiceUrl = String.Empty;
tbxReferenceURL.Text = homeUrl;
@@ -183,7 +177,8 @@ public WebReferenceDialog (WebReferenceItem item, ClientOptions options)
Build ();
this.isWebService = true;
this.wcfOptions = options;
- this.namespacePrefix = item.Project.DefaultNamespace;
+ this.NamespacePrefix = item.Project.DefaultNamespace;
+ ServiceUrl = String.Empty;
ChangeState (DialogState.ModifyConfig);
@@ -348,9 +343,9 @@ void QueryService (object param)
string url = param as string;
// Set the service url
lock (queryLock) {
- if (serviceUrl == url)
+ if (ServiceUrl == url)
return;
- serviceUrl = url;
+ ServiceUrl = url;
}
WebServiceEngine serviceEngine;
@@ -366,7 +361,7 @@ void QueryService (object param)
try {
service = serviceEngine.Discover (url);
} catch (Exception ex) {
- serviceUrl = null;
+ ServiceUrl = null;
IsWebService = false;
selectedService = null;
LoggingService.LogError ("Error while discovering web services", ex);
@@ -392,7 +387,7 @@ void ShowError (string error)
void UpdateService (WebServiceDiscoveryResult service, string url)
{
- StringBuilder text = new StringBuilder ();
+ var text = new StringBuilder ();
if (service == null) {
IsWebService = false;
@@ -424,10 +419,7 @@ void UpdateService (WebServiceDiscoveryResult service, string url)
}
if (docLabel != null) {
docLabel.Wrap = false;
- if (text.Length >= 0)
- docLabel.Markup = text.ToString ();
- else
- docLabel.Markup = GettextCatalog.GetString ("Web service not found.");
+ docLabel.Markup = text.Length >= 0 ? text.ToString () : GettextCatalog.GetString ("Web service not found.");
}
return;
}
@@ -460,7 +452,7 @@ protected virtual void OnBtnOKClicked (object sender, EventArgs e)
protected virtual void OnComboModelChanged (object sender, EventArgs e)
{
- serviceUrl = null;
+ ServiceUrl = null;
ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
@@ -537,7 +529,7 @@ void ChangeState (DialogState newState)
return;
if (state != DialogState.Uninitialized)
- frmBrowser.Forall (c => frmBrowser.Remove (c));
+ frmBrowser.Forall (frmBrowser.Remove);
browser = null;
browserWidget = null;
@@ -636,22 +628,20 @@ public NetworkCredential GetCredential (Uri uri, string authType)
if (tempCredentials.TryGetValue (uri.Host + uri.AbsolutePath, out nc))
return nc; // Exact match
- UserPasswordDialog dlg = new UserPasswordDialog (uri.Host);
+ var dlg = new UserPasswordDialog (uri.Host);
if (tempCredentials.TryGetValue (uri.Host, out nc) || credentials.TryGetValue (uri.Host, out nc)) {
dlg.User = nc.UserName;
dlg.Password = nc.Password;
}
try {
- if (MessageService.RunCustomDialog (dlg) == (int) ResponseType.Ok) {
+ if (MessageService.RunCustomDialog (dlg) == (int)ResponseType.Ok) {
nc = new NetworkCredential (dlg.User, dlg.Password);
tempCredentials [uri.Host + uri.AbsolutePath] = nc;
tempCredentials [uri.Host] = nc;
return nc;
}
- else {
- Canceled = true;
- return null;
- }
+ Canceled = true;
+ return null;
} finally {
dlg.Destroy ();
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
===================================================================
@@ -26,11 +26,11 @@ public override void GetNodeAttributes (ITreeNavigator parentNode, object dataOb
if (parentNode.Options ["ShowAllFiles"])
return;
- ProjectFolder folder = dataObject as ProjectFolder;
+ var folder = dataObject as ProjectFolder;
if (folder == null)
return;
- DotNetProject project = folder.Project as DotNetProject;
+ var project = folder.Project as DotNetProject;
if (project == null)
return;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
===================================================================
@@ -33,13 +33,13 @@ public override bool CanBuildNode (Type dataType)
public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
{
- DotNetProject project = (DotNetProject) dataObject;
+ var project = (DotNetProject) dataObject;
return WebReferencesService.GetWebReferenceItems (project).Any ();
}
public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
- DotNetProject project = (DotNetProject) dataObject;
+ var project = (DotNetProject) dataObject;
if (WebReferencesService.GetWebReferenceItems (project).Any ())
treeBuilder.AddChild (new WebReferenceFolder (project));
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
===================================================================
@@ -68,7 +68,7 @@ public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
/// <param name="dataObject">An object containing the data for the current node in the tree.</param>
public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
- WebReferenceFolder folder = (WebReferenceFolder) dataObject;
+ var folder = (WebReferenceFolder) dataObject;
foreach (WebReferenceItem item in WebReferencesService.GetWebReferenceItems (folder.Project))
treeBuilder.AddChild(item);
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
===================================================================
@@ -69,7 +69,7 @@ public override FilePath GetReferencePath (DotNetProject project, string refName
public override string GetDescriptionMarkup ()
{
- StringBuilder text = new StringBuilder ();
+ var text = new StringBuilder ();
if (protocol != null) {
foreach (object dd in protocol.Documents.Values) {
@@ -97,7 +97,7 @@ public override string GetDescriptionMarkup ()
protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
{
if (!dotNetProject.Items.GetAll<WCFMetadata> ().Any ()) {
- WCFMetadata met = new WCFMetadata ();
+ var met = new WCFMetadata ();
met.Path = basePath.ParentDirectory;
dotNetProject.Items.Add (met);
}
@@ -113,7 +113,7 @@ protected override string GenerateDescriptionFiles (DotNetProject dotNetProject,
refGroup = ConvertMapFile (file);
} else {
// TODO
- ReferenceGroup map = new ReferenceGroup ();
+ var map = new ReferenceGroup ();
map.ClientOptions = defaultOptions;
map.Save (file);
map.ID = Guid.NewGuid ().ToString ();
@@ -131,7 +131,7 @@ public override void Update ()
if (resfile.MetadataSources.Count == 0)
return;
string url = resfile.MetadataSources [0].Address;
- WebServiceDiscoveryResultWCF wref = (WebServiceDiscoveryResultWCF) WebReferencesService.WcfEngine.Discover (url);
+ var wref = (WebServiceDiscoveryResultWCF) WebReferencesService.WcfEngine.Discover (url);
if (wref == null)
return;
@@ -150,8 +150,8 @@ public override IEnumerable<string> GetAssemblyReferences ()
protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName)
{
- CodeCompileUnit ccu = new CodeCompileUnit ();
- CodeNamespace cns = new CodeNamespace (proxyNamespace);
+ var ccu = new CodeCompileUnit ();
+ var cns = new CodeNamespace (proxyNamespace);
ccu.Namespaces.Add (cns);
bool targetMoonlight = dotNetProject.TargetFramework.Id.Identifier == ("Silverlight");
@@ -161,7 +161,7 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
bool targetCoreClr = targetMoonlight || targetMonoDroid || targetMonoTouch;
bool generateSyncMethods = targetMonoDroid | targetMonoTouch;
- ServiceContractGenerator generator = new ServiceContractGenerator (ccu);
+ var generator = new ServiceContractGenerator (ccu);
generator.Options = ServiceContractGenerationOptions.ChannelInterface | ServiceContractGenerationOptions.ClientClass;
if (refGroup.ClientOptions.GenerateAsynchronousMethods || targetCoreClr)
generator.Options |= ServiceContractGenerationOptions.AsynchronousMethods;
@@ -173,18 +173,15 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
// generator.Options |= ServiceContractGenerationOptions.EventBasedAsynchronousMethods;
MetadataSet mset;
- if (protocol != null)
- mset = ToMetadataSet (protocol);
- else
- mset = metadata;
+ mset = protocol != null ? ToMetadataSet (protocol) : metadata;
CodeDomProvider code_provider = GetProvider (dotNetProject);
- List<IWsdlImportExtension> list = new List<IWsdlImportExtension> ();
+ var list = new List<IWsdlImportExtension> ();
list.Add (new TransportBindingElementImporter ());
list.Add (new XmlSerializerMessageContractImporter ());
- WsdlImporter importer = new WsdlImporter (mset);
+ var importer = new WsdlImporter (mset);
try {
ConfigureImporter (importer);
} catch {
@@ -240,10 +237,10 @@ void ConfigureImporter (WsdlImporter importer)
ReferenceGroup ConvertMapFile (string mapFile)
{
- DiscoveryClientProtocol prot = new DiscoveryClientProtocol ();
+ var prot = new DiscoveryClientProtocol ();
DiscoveryClientResultCollection files = prot.ReadAll (mapFile);
- ReferenceGroup map = new ReferenceGroup ();
+ var map = new ReferenceGroup ();
if (refGroup != null) {
map.ClientOptions = refGroup.ClientOptions;
@@ -253,23 +250,23 @@ ReferenceGroup ConvertMapFile (string mapFile)
map.ID = Guid.NewGuid ().ToString ();
}
- Dictionary<string,int> sources = new Dictionary<string, int> ();
+ var sources = new Dictionary<string, int> ();
foreach (DiscoveryClientResult res in files) {
string url = res.Url;
- Uri uri = new Uri (url);
+ var uri = new Uri (url);
if (!string.IsNullOrEmpty (uri.Query))
url = url.Substring (0, url.Length - uri.Query.Length);
int nSource;
if (!sources.TryGetValue (url, out nSource)) {
nSource = sources.Count + 1;
sources [url] = nSource;
- MetadataSource ms = new MetadataSource ();
+ var ms = new MetadataSource ();
ms.Address = url;
ms.Protocol = uri.Scheme;
ms.SourceId = nSource.ToString ();
map.MetadataSources.Add (ms);
}
- MetadataFile file = new MetadataFile ();
+ var file = new MetadataFile ();
file.FileName = res.Filename;
file.ID = Guid.NewGuid ().ToString ();
file.SourceId = nSource.ToString ();
@@ -287,15 +284,15 @@ ReferenceGroup ConvertMapFile (string mapFile)
static MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
{
- MetadataSet metadata = new MetadataSet ();
+ var metadata = new MetadataSet ();
foreach (object o in prot.Documents.Values) {
if (o is System.Web.Services.Description.ServiceDescription) {
metadata.MetadataSections.Add (
- new MetadataSection (MetadataSection.ServiceDescriptionDialect, "", (ServiceDescription) o));
+ new MetadataSection (MetadataSection.ServiceDescriptionDialect, "", o));
}
if (o is XmlSchema) {
metadata.MetadataSections.Add (
- new MetadataSection (MetadataSection.XmlSchemaDialect, "", (XmlSchema) o));
+ new MetadataSection (MetadataSection.XmlSchemaDialect, "", o));
}
}
@@ -305,9 +302,7 @@ static MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
public override string GetServiceURL ()
{
ReferenceGroup resfile = ReferenceGroup.Read (Item.MapFile.FilePath);
- if (resfile.MetadataSources.Count == 0)
- return null;
- return resfile.MetadataSources [0].Address;
+ return resfile.MetadataSources.Count == 0 ? null : resfile.MetadataSources [0].Address;
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
===================================================================
@@ -67,7 +67,7 @@ static MetadataSet ResolveWithWSMex (string url)
{
MetadataSet metadata = null;
try {
- MetadataExchangeClient client = new MetadataExchangeClient (new EndpointAddress (url));
+ var client = new MetadataExchangeClient (new EndpointAddress (url));
Console.WriteLine ("\nAttempting to download metadata from {0} using WS-MetadataExchange..", url);
metadata = client.GetMetadata ();
@@ -75,10 +75,7 @@ static MetadataSet ResolveWithWSMex (string url)
//MetadataExchangeClient wraps exceptions, thrown while
//fetching the metadata, in an InvalidOperationException
string msg;
- if (e.InnerException == null)
- msg = e.Message;
- else
- msg = e.InnerException.ToString ();
+ msg = e.InnerException == null ? e.Message : e.InnerException.ToString ();
Console.WriteLine ("WS-MetadataExchange query failed for the url '{0}' with exception :\n {1}",
url, msg);
@@ -110,7 +107,7 @@ public override WebServiceDiscoveryResult Load (WebReferenceItem item)
// TODO: Read as MetadataSet
- DiscoveryClientProtocol protocol = new DiscoveryClientProtocol ();
+ var protocol = new DiscoveryClientProtocol ();
foreach (MetadataFile dcr in resfile.Metadata)
{
@@ -130,7 +127,7 @@ public override WebServiceDiscoveryResult Load (WebReferenceItem item)
}
dr.Url = dcr.SourceUrl;
- FileStream fs = new FileStream (basePath.Combine (dcr.FileName), FileMode.Open, FileAccess.Read);
+ var fs = new FileStream (basePath.Combine (dcr.FileName), FileMode.Open, FileAccess.Read);
protocol.Documents.Add (dr.Url, dr.ReadDocument (fs));
fs.Close ();
protocol.References.Add (dr.Url, dr);
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
===================================================================
@@ -57,7 +57,7 @@ public override FilePath GetReferencePath (DotNetProject project, string refName
public override string GetDescriptionMarkup ()
{
- StringBuilder text = new StringBuilder ();
+ var text = new StringBuilder ();
foreach (object dd in protocol.Documents.Values) {
if (dd is ServiceDescription) {
Library.GenerateWsdlXml (text, protocol);
@@ -80,7 +80,7 @@ public override string GetDescriptionMarkup ()
protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
{
if (!dotNetProject.Items.GetAll<WebReferencesDir> ().Any ()) {
- WebReferencesDir met = new WebReferencesDir ();
+ var met = new WebReferencesDir ();
met.Path = basePath.ParentDirectory;
dotNetProject.Items.Add (met);
}
@@ -107,7 +107,7 @@ public override void Update ()
if (wru == null)
return;
- WebServiceDiscoveryResultWS wref = (WebServiceDiscoveryResultWS) WebReferencesService.WsEngine.Discover (wru.UpdateFromURL);
+ var wref = (WebServiceDiscoveryResultWS) WebReferencesService.WsEngine.Discover (wru.UpdateFromURL);
if (wref == null)
return;
@@ -128,9 +128,9 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
{
// Setup the proxy namespace and compile unit
CodeDomProvider codeProv = GetProvider (dotNetProject);
- CodeNamespace codeNamespace = new CodeNamespace (proxyNamespace);
- CodeConstructor urlConstructor = new CodeConstructor ();
- CodeCompileUnit codeUnit = new CodeCompileUnit ();
+ var codeNamespace = new CodeNamespace (proxyNamespace);
+ var urlConstructor = new CodeConstructor ();
+ var codeUnit = new CodeCompileUnit ();
codeUnit.Namespaces.Add (codeNamespace);
// Setup the importer and import the service description into the code unit
@@ -156,7 +156,7 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
// Generate the code and save the file
string fileSpec = Path.Combine (basePath, dotNetProject.LanguageBinding.GetFileName (referenceName));
- StreamWriter writer = new StreamWriter (fileSpec);
+ var writer = new StreamWriter (fileSpec);
codeProv.GenerateCodeFromCompileUnit (codeUnit, writer, new CodeGeneratorOptions ());
writer.Close ();
@@ -167,10 +167,8 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
public override string GetServiceURL ()
{
WebReferenceUrl wru = Item.Project.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == Item.BasePath);
- if (wru == null)
- return null;
+ return wru == null ? null : wru.ServiceLocationURL;
- return wru.ServiceLocationURL;
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
===================================================================
@@ -49,7 +49,7 @@ public override WebServiceDiscoveryResult Discover (string url)
public override WebServiceDiscoveryResult Load (WebReferenceItem item)
{
// Read the map file into the discovery client protocol and setup the code generator
- DiscoveryProtocol protocol = new DiscoveryProtocol ();
+ var protocol = new DiscoveryProtocol ();
protocol.ReadAllUseBasePath (item.MapFile.FilePath);
return new WebServiceDiscoveryResultWS (protocol, item);
}
@@ -108,7 +108,7 @@ static void ImportReferenceUrlItems (DotNetProject project)
string url = GetUrl (file.FilePath);
if (url == null)
continue;
- WebReferenceUrl wru = new WebReferenceUrl (url);
+ var wru = new WebReferenceUrl (url);
wru.RelPath = file.FilePath.ParentDirectory;
project.Items.Add (wru);
}
@@ -117,16 +117,19 @@ static void ImportReferenceUrlItems (DotNetProject project)
static string GetUrl (FilePath mapPath)
{
- DiscoveryProtocol protocol = new DiscoveryProtocol ();
+ var protocol = new DiscoveryProtocol ();
protocol.ReadAllUseBasePath (mapPath);
// Refresh the disco and wsdl from the server
foreach (object doc in protocol.References.Values) {
string url = null;
- if (doc is DiscoveryDocumentReference) {
- url = ((DiscoveryDocumentReference)doc).Url;
- } else if (doc is ContractReference) {
- url = ((ContractReference)doc).Url;
+ var discoveryDocumentReference = doc as DiscoveryDocumentReference;
+ if (discoveryDocumentReference != null) {
+ url = discoveryDocumentReference.Url;
+ } else {
+ var contractReference = doc as ContractReference;
+ if (contractReference != null)
+ url = contractReference.Url;
}
if (!string.IsNullOrEmpty (url))
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
===================================================================
@@ -22,9 +22,9 @@ public class DiscoveryProtocol : DiscoveryClientProtocol
public DiscoveryClientResultCollection ReadAllUseBasePath(string topLevelFilename)
{
string basePath = (new FileInfo(topLevelFilename)).Directory.FullName;
- StreamReader sr = new StreamReader (topLevelFilename);
- XmlSerializer ser = new XmlSerializer (typeof (DiscoveryClientResultsFile));
- DiscoveryClientResultsFile resfile = (DiscoveryClientResultsFile) ser.Deserialize (sr);
+ var sr = new StreamReader (topLevelFilename);
+ var ser = new XmlSerializer (typeof (DiscoveryClientResultsFile));
+ var resfile = (DiscoveryClientResultsFile) ser.Deserialize (sr);
sr.Close ();
foreach (DiscoveryClientResult dcr in resfile.Results)
@@ -43,9 +43,9 @@ public DiscoveryClientResultCollection ReadAllUseBasePath(string topLevelFilenam
continue;
}
- DiscoveryReference dr = (DiscoveryReference) Activator.CreateInstance(type);
+ var dr = (DiscoveryReference) Activator.CreateInstance(type);
dr.Url = dcr.Url;
- FileStream fs = new FileStream (Path.Combine(basePath, dcr.Filename), FileMode.Open, FileAccess.Read);
+ var fs = new FileStream (Path.Combine(basePath, dcr.Filename), FileMode.Open, FileAccess.Read);
Documents.Add (dr.Url, dr.ReadDocument (fs));
fs.Close ();
References.Add (dr.Url, dr);
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
===================================================================
@@ -20,10 +20,10 @@ public static class Library
/// <returns>A ServiceDescription for the specified uri.</returns>
public static ServiceDescription ReadServiceDescription(string uri)
{
- ServiceDescription desc = new ServiceDescription();
+ var desc = new ServiceDescription();
try
{
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
+ var request = (HttpWebRequest)WebRequest.Create(uri);
WebResponse response = request.GetResponse();
desc = ServiceDescription.Read(response.GetResponseStream());
@@ -41,16 +41,20 @@ public static ServiceDescription ReadServiceDescription(string uri)
public static ServiceDescriptionImporter ReadServiceDescriptionImporter(DiscoveryClientProtocol protocol)
{
// Service Description Importer
- ServiceDescriptionImporter importer = new ServiceDescriptionImporter();
+ var importer = new ServiceDescriptionImporter();
importer.ProtocolName = "Soap";
// Add all the schemas and service descriptions to the importer
protocol.ResolveAll ();
foreach (object doc in protocol.Documents.Values)
{
- if (doc is ServiceDescription)
- importer.AddServiceDescription((ServiceDescription)doc, null, null);
- else if (doc is XmlSchema)
- importer.Schemas.Add((XmlSchema)doc);
+ var serviceDescription = doc as ServiceDescription;
+ if (serviceDescription != null)
+ importer.AddServiceDescription (serviceDescription, null, null);
+ else {
+ var xmlSchema = doc as XmlSchema;
+ if (xmlSchema != null)
+ importer.Schemas.Add (xmlSchema);
+ }
}
return importer;
}
@@ -63,7 +67,7 @@ public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
text.Append ("<big><b>" + GettextCatalog.GetString ("Web Service References") + "</b></big>\n\n");
foreach (object oref in doc.References)
{
- DiscoveryReference dref = oref as DiscoveryReference;
+ var dref = oref as DiscoveryReference;
if (dref == null)
continue;
if (dref is ContractReference) {
@@ -82,8 +86,8 @@ public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol protocol)
{
// Code Namespace & Compile Unit
- CodeNamespace codeNamespace = new CodeNamespace();
- CodeCompileUnit codeUnit = new CodeCompileUnit();
+ var codeNamespace = new CodeNamespace();
+ var codeUnit = new CodeCompileUnit();
codeUnit.Namespaces.Add(codeNamespace);
// Import and set the warning
@@ -102,7 +106,7 @@ public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol
foreach (CodeTypeMember mem in type.Members)
{
- CodeMemberMethod met = mem as CodeMemberMethod;
+ var met = mem as CodeMemberMethod;
if (met != null && !(mem is CodeConstructor))
{
// Method
@@ -144,7 +148,7 @@ public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol
public static string GetCommentElements (CodeTypeMember member)
{
- StringBuilder coms = new StringBuilder ();
+ var coms = new StringBuilder ();
foreach (CodeCommentStatement comment in member.Comments)
{
string com = comment.Comment.Text;
@@ -164,9 +168,7 @@ public static string GetCommentElements (CodeTypeMember member)
public static FilePath GetWebReferencePath (Project project)
{
FilePath fp = project.BaseDirectory.Combine ("WebReferences");
- if (Directory.Exists (fp))
- return fp;
- return project.BaseDirectory.Combine ("Web References");
+ return Directory.Exists (fp) ? fp : project.BaseDirectory.Combine ("Web References");
}
/// <summary>Checks whether or not the current project does contain any web references.</summary>
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
===================================================================
@@ -330,7 +330,7 @@ void FixupSync ()
var od = context.Operation;
// sync method implementation
- CodeMemberMethod cm = new CodeMemberMethod ();
+ var cm = new CodeMemberMethod ();
type.Members.Add (cm);
cm.Name = od.Name;
// Analysis disable BitwiseOperatorOnEnumWithoutFlags
@@ -377,7 +377,7 @@ public void FixupAsync ()
var asyncResultType = new CodeTypeReference (typeof (IAsyncResult));
// BeginXxx() implementation
- CodeMemberMethod cm = new CodeMemberMethod {
+ var cm = new CodeMemberMethod {
Name = "Begin" + od.Name,
// Analysis disable BitwiseOperatorOnEnumWithoutFlags
Attributes = MemberAttributes.Public | MemberAttributes.Final,
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
===================================================================
@@ -30,7 +30,7 @@ public WebReferenceFolder (DotNetProject project)
/// <returns>True of the other object is equal to the current object, otherwise false.</returns>
public override bool Equals (object obj)
{
- WebReferenceFolder folder = obj as WebReferenceFolder;
+ var folder = obj as WebReferenceFolder;
return folder != null && project == folder.project;
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
===================================================================
@@ -8,14 +8,12 @@ namespace MonoDevelop.WebReferences
public class WebReferenceItem
{
readonly DotNetProject project;
- string name;
readonly ProjectFile mapFile;
readonly WebServiceEngine engine;
- public string Name
- {
- get { return name; }
- set { name = value; }
+ public string Name {
+ get;
+ set;
}
public ProjectFile MapFile {
@@ -33,7 +31,7 @@ public string Name
public WebReferenceItem (WebServiceEngine engine, DotNetProject project, string name, FilePath basePath, ProjectFile mapFile)
{
this.engine = engine;
- this.name = name;
+ this.Name = name;
this.project = project;
this.mapFile = mapFile;
BasePath = basePath.CanonicalPath;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
===================================================================
@@ -38,7 +38,7 @@ public abstract class WebServiceDiscoveryResult
WebReferenceItem item;
readonly WebServiceEngine engine;
- public WebServiceDiscoveryResult (WebServiceEngine engine, WebReferenceItem item)
+ protected WebServiceDiscoveryResult (WebServiceEngine engine, WebReferenceItem item)
{
this.item = item;
this.engine = engine;
@@ -85,7 +85,7 @@ public virtual void GenerateFiles (DotNetProject project, string namspace, strin
Directory.CreateDirectory (basePath);
// Remove old files from the service directory
- List<ProjectFile> toRemove = new List<ProjectFile>(project.Files.GetFilesInPath (basePath));
+ var toRemove = new List<ProjectFile>(project.Files.GetFilesInPath (basePath));
foreach (ProjectFile f in toRemove)
project.Files.Remove (f);
@@ -95,13 +95,13 @@ public virtual void GenerateFiles (DotNetProject project, string namspace, strin
// Generate the proxy class
string proxySpec = CreateProxyFile (project, basePath, namspace + "." + referenceName, "Reference");
- ProjectFile mapFile = new ProjectFile (mapSpec);
+ var mapFile = new ProjectFile (mapSpec);
mapFile.BuildAction = BuildAction.None;
mapFile.Subtype = Subtype.Code;
mapFile.Generator = ProxyGenerator;
project.Files.Add (mapFile);
- ProjectFile proxyFile = new ProjectFile (proxySpec);
+ var proxyFile = new ProjectFile (proxySpec);
proxyFile.BuildAction = BuildAction.Compile;
proxyFile.Subtype = Subtype.Code;
proxyFile.DependsOn = mapFile.FilePath;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
===================================================================
@@ -41,7 +41,7 @@ public abstract class WebServiceEngine
public virtual void Delete (WebReferenceItem item)
{
- List<ProjectFile> toRemove = new List<ProjectFile> (item.Project.Files.GetFilesInPath (item.BasePath));
+ var toRemove = new List<ProjectFile> (item.Project.Files.GetFilesInPath (item.BasePath));
foreach (ProjectFile file in toRemove)
item.Project.Files.Remove (file);
FileService.DeleteDirectory (item.BasePath);
@@ -50,8 +50,8 @@ public virtual void Delete (WebReferenceItem item)
protected DiscoveryClientProtocol DiscoResolve (string url)
{
// Checks the availablity of any services
- DiscoveryClientProtocol protocol = new DiscoveryClientProtocol ();
- AskCredentials creds = new AskCredentials ();
+ var protocol = new DiscoveryClientProtocol ();
+ var creds = new AskCredentials ();
protocol.Credentials = creds;
bool unauthorized;
@@ -62,7 +62,7 @@ protected DiscoveryClientProtocol DiscoResolve (string url)
try {
protocol.DiscoverAny (url);
} catch (WebException wex) {
- HttpWebResponse wr = wex.Response as HttpWebResponse;
+ var wr = wex.Response as HttpWebResponse;
if (!creds.Canceled && wr != null && wr.StatusCode == HttpStatusCode.Unauthorized) {
unauthorized = true;
continue;
Commit: c1bb9c711c1d4beeea98bace3c8cce9438bf0917
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-11-12 02:07:00 GMT
URL: https://github.com/mono/monodevelop/commit/c1bb9c711c1d4beeea98bace3c8cce9438bf0917
Merge pull request #431 from mono/webReferencesFix
Web references cleanup and implement some other default types
Changed paths:
M main/src/addins/MonoDevelop.WebReferences/AddinInfo.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommands.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/UserPasswordDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ClientOptions.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/CollectionMapping.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ExtensionFile.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataFile.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataSource.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferenceGroup.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferencedAssembly.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryNetworkCredential.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
Modified: main/src/addins/MonoDevelop.WebReferences/AddinInfo.cs
===================================================================
@@ -1,7 +1,5 @@
-using System;
using Mono.Addins;
-using Mono.Addins.Description;
[assembly:Addin ("WebReferences",
Namespace = "MonoDevelop",
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
===================================================================
@@ -1,5 +1,4 @@
using System;
-using System.IO;
using System.Linq;
using MonoDevelop.Components.Commands;
using MonoDevelop.Core;
@@ -9,8 +8,6 @@
using MonoDevelop.Ide;
using System.Collections.Generic;
using MonoDevelop.Core.Assemblies;
-using System.Threading.Tasks;
-using System.ServiceModel;
namespace MonoDevelop.WebReferences.Commands
{
@@ -22,11 +19,11 @@ public class WebReferenceCommandHandler : NodeCommandHandler
}
/// <summary>Execute the command for adding a new web reference to a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Add)]
+ [CommandHandler (WebReferenceCommands.Add)]
public void NewWebReference()
{
// Get the project and project folder
- DotNetProject project = CurrentNode.GetParentDataItem (typeof(DotNetProject), true) as DotNetProject;
+ var project = CurrentNode.GetParentDataItem (typeof(DotNetProject), true) as DotNetProject;
// Check and switch the runtime environment for the current project
if (project.TargetFramework.Id == TargetFrameworkMoniker.NET_1_1)
@@ -35,14 +32,14 @@ public void NewWebReference()
question += "Web Service is not supported in this version.";
question += "Do you want switch the runtime environment for this project version 2.0 ?";
- AlertButton switchButton = new AlertButton ("_Switch to .NET2");
+ var switchButton = new AlertButton ("_Switch to .NET2");
if (MessageService.AskQuestion(question, AlertButton.Cancel, switchButton) == switchButton)
project.TargetFramework = Runtime.SystemAssemblyService.GetTargetFramework (TargetFrameworkMoniker.NET_2_0);
else
return;
}
- WebReferenceDialog dialog = new WebReferenceDialog (project);
+ var dialog = new WebReferenceDialog (project);
dialog.NamespacePrefix = project.DefaultNamespace;
try {
@@ -58,8 +55,8 @@ public void NewWebReference()
}
}
- [CommandUpdateHandler (MonoDevelop.WebReferences.WebReferenceCommands.Update)]
- [CommandUpdateHandler (MonoDevelop.WebReferences.WebReferenceCommands.UpdateAll)]
+ [CommandUpdateHandler (WebReferenceCommands.Update)]
+ [CommandUpdateHandler (WebReferenceCommands.UpdateAll)]
void CanUpdateWebReferences (CommandInfo ci)
{
// This does not appear to work.
@@ -67,14 +64,14 @@ void CanUpdateWebReferences (CommandInfo ci)
}
/// <summary>Execute the command for updating a web reference in a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Update)]
+ [CommandHandler (WebReferenceCommands.Update)]
public void Update()
{
UpdateReferences (new [] { (WebReferenceItem) CurrentNode.DataItem });
}
/// <summary>Execute the command for updating all web reference in a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.UpdateAll)]
+ [CommandHandler (WebReferenceCommands.UpdateAll)]
public void UpdateAll()
{
DotNetProject project = ((WebReferenceFolder) CurrentNode.DataItem).Project;
@@ -125,10 +122,10 @@ void DisposeUpdateContext ()
}
/// <summary>Execute the command for removing a web reference from a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Delete)]
+ [CommandHandler (WebReferenceCommands.Delete)]
public void Delete()
{
- WebReferenceItem item = (WebReferenceItem) CurrentNode.DataItem;
+ var item = (WebReferenceItem) CurrentNode.DataItem;
if (!MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the web service reference '{0}'?", item.Name), AlertButton.Delete))
return;
item.Delete();
@@ -137,11 +134,11 @@ public void Delete()
}
/// <summary>Execute the command for removing all web references from a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.DeleteAll)]
+ [CommandHandler (WebReferenceCommands.DeleteAll)]
public void DeleteAll()
{
DotNetProject project = ((WebReferenceFolder) CurrentNode.DataItem).Project;
- List<WebReferenceItem> items = new List<WebReferenceItem> (WebReferencesService.GetWebReferenceItems (project));
+ var items = new List<WebReferenceItem> (WebReferencesService.GetWebReferenceItems (project));
foreach (var item in items)
item.Delete();
@@ -149,7 +146,7 @@ public void DeleteAll()
IdeApp.Workbench.StatusBar.ShowMessage("Deleted all Web References");
}
- [CommandUpdateHandler (MonoDevelop.WebReferences.WebReferenceCommands.Configure)]
+ [CommandUpdateHandler (WebReferenceCommands.Configure)]
void CanConfigureWebReferences (CommandInfo ci)
{
var item = CurrentNode.DataItem as WebReferenceItem;
@@ -157,7 +154,7 @@ void CanConfigureWebReferences (CommandInfo ci)
}
/// <summary>Execute the command for configuring a web reference in a project.</summary>
- [CommandHandler (MonoDevelop.WebReferences.WebReferenceCommands.Configure)]
+ [CommandHandler (WebReferenceCommands.Configure)]
public void Configure ()
{
var item = (WebReferenceItem) CurrentNode.DataItem;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommands.cs
===================================================================
@@ -1,4 +1,3 @@
-using System;
namespace MonoDevelop.WebReferences
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/UserPasswordDialog.cs
===================================================================
@@ -23,7 +23,6 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
using MonoDevelop.Core;
namespace MonoDevelop.WebReferences.Dialogs
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.WebReferences.Dialogs
{
[System.ComponentModel.ToolboxItem(true)]
- public partial class WCFConfigWidget : Gtk.Bin
+ public partial class WCFConfigWidget : Bin
{
public WCFConfigWidget (ClientOptions options)
{
@@ -53,17 +53,23 @@ public WCFConfigWidget (ClientOptions options)
static readonly Type[] DefaultListTypes = {
typeof (Array),
- typeof (System.Collections.Generic.LinkedList<>),
- typeof (System.Collections.Generic.List<>),
+ typeof (System.Collections.ArrayList),
+ typeof (LinkedList<>),
+ typeof (List<>),
typeof (System.Collections.ObjectModel.Collection<>),
typeof (System.Collections.ObjectModel.ObservableCollection<>),
typeof (System.ComponentModel.BindingList<>)
};
static readonly Type[] DefaultDictionaryTypes = {
- typeof (System.Collections.Generic.Dictionary<,>),
- typeof (System.Collections.Generic.SortedList<,>),
- typeof (System.Collections.Generic.SortedDictionary<,>)
+ typeof (Dictionary<, >),
+ typeof (SortedList<, >),
+ typeof (SortedDictionary<, >),
+ typeof (System.Collections.Hashtable),
+ typeof (System.Collections.SortedList),
+ typeof (System.Collections.Specialized.HybridDictionary),
+ typeof (System.Collections.Specialized.ListDictionary),
+ typeof (System.Collections.Specialized.OrderedDictionary)
};
public bool Modified {
@@ -71,8 +77,8 @@ public WCFConfigWidget (ClientOptions options)
private set;
}
- List<Type> listTypes;
- List<Type> dictTypes;
+ readonly List<Type> listTypes;
+ readonly List<Type> dictTypes;
static bool? runtimeSupport;
@@ -106,19 +112,15 @@ internal static Type GetType (string name)
var type = typeof (char).Assembly.GetType (name);
if (type != null)
return type;
- type = typeof (System.Collections.Generic.LinkedList<>).Assembly.GetType (name);
- if (type != null)
- return type;
- return null;
+ type = typeof (LinkedList<>).Assembly.GetType (name);
+ return type;
}
internal static string GetTypeName (Type type)
{
var name = type.FullName;
- var pos = name.IndexOf ("`");
- if (pos < 0)
- return name;
- return name.Substring (0, pos);
+ var pos = name.IndexOf ("`", StringComparison.Ordinal);
+ return pos < 0 ? name : name.Substring (0, pos);
}
void PopulateBox (ComboBox box, string category, List<Type> types)
@@ -140,7 +142,7 @@ void PopulateBox (ComboBox box, string category, List<Type> types)
box.Active = types.IndexOf (current);
}
- void UpdateBox (ComboBox box, string category, List<Type> types)
+ void UpdateBox (ComboBox box, string category, IList<Type> types)
{
var mapping = Options.CollectionMappings.FirstOrDefault (m => m.Category == category);
if (mapping == null) {
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
===================================================================
@@ -18,11 +18,11 @@
namespace MonoDevelop.WebReferences.Dialogs
{
- internal partial class WebReferenceDialog : Gtk.Dialog
+ internal partial class WebReferenceDialog : Dialog
{
#region Widgets
- protected Widget browserWidget = null;
- protected IWebBrowser browser = null;
+ protected Widget browserWidget;
+ protected IWebBrowser browser;
#endregion
enum DialogState {
@@ -36,10 +36,10 @@ enum DialogState {
bool modified;
bool isWebService;
WCFConfigWidget wcfConfig;
- ClientOptions wcfOptions;
+ readonly ClientOptions wcfOptions;
DialogState state = DialogState.Uninitialized;
Label docLabel;
- DotNetProject project;
+ readonly DotNetProject project;
#region Properties
/// <summary>Gets or Sets whether the current location of the browser is a valid web service or not.</summary>
@@ -52,7 +52,7 @@ private set
// Clear out the Reference and Namespace Entry
if (isWebService && !value)
{
- this.tbxReferenceName.Text = "";
+ tbxReferenceName.Text = "";
}
isWebService = value;
ChangeState (state);
@@ -61,25 +61,23 @@ private set
/// <summary>Gets or Sets the current url for web service</summary>
/// <value>A string containing the url of the web service</value>
- public string ServiceUrl
- {
- get { return serviceUrl; }
- set { serviceUrl = value; }
+ public string ServiceUrl {
+ get;
+ set;
}
/// <summary>Gets or Sets the namespace prefix for the web service</summary>
/// <value>A string containing namespace prefix value for the web service</value>
- public string NamespacePrefix
- {
- get { return namespacePrefix; }
- set { namespacePrefix = value; }
+ public string NamespacePrefix {
+ get;
+ set;
}
/// <summary>Gets the default namespace for the web service based of the service url and namespace prefix</summary>
/// <value>A string containing default namespace for the web service</value>
public string DefaultNamespace
{
- get { return namespacePrefix; }
+ get { return NamespacePrefix; }
}
/// <summary>Gets the default reference name for the web service based of the service url</summary>
@@ -88,15 +86,12 @@ public string DefaultReferenceName
{
get
{
- Uri discoveryUri = new Uri(this.ServiceUrl);
- if (discoveryUri != null)
- return MakeValidId (discoveryUri.Host);
- else
- return String.Empty;
+ var discoveryUri = new Uri (ServiceUrl);
+ return discoveryUri != null ? MakeValidId (discoveryUri.Host) : String.Empty;
}
}
- string MakeValidId (string name)
+ static string MakeValidId (string name)
{
bool isWordStart = true;
for (int n=0; n<name.Length; n++) {
@@ -104,8 +99,7 @@ string MakeValidId (string name)
if (char.IsNumber (c) && isWordStart) {
if (n == 0)
return "n" + name.Replace ('.','_');
- else
- return name.Replace ('.','_');
+ return name.Replace ('.','_');
}
isWordStart = c == '.';
}
@@ -116,14 +110,14 @@ string MakeValidId (string name)
/// <value>A string containing the name for the web reference.</value>
public string ReferenceName
{
- get { return this.tbxReferenceName.Text; }
+ get { return tbxReferenceName.Text; }
}
/// <summary>Gets the namespace for the web reference.</summary>
/// <value>A string containing the namespace for the web refrence.</value>
public string Namespace
{
- get { return this.tbxNamespace.Text; }
+ get { return tbxNamespace.Text; }
}
/// <summary>Gets the selected service discovery result.</summary>
@@ -134,10 +128,9 @@ public WebServiceDiscoveryResult SelectedService
/// <summary>Gets or Sets the the base path of the where the web reference.</summary>
/// <value>A string containing the base path where all the web references are stored in.</value>
- public string BasePath
- {
- get { return basePath; }
- set { basePath = value; }
+ public string BasePath {
+ get;
+ set;
}
/// <summary>Gets the the base path for the current reference.</summary>
@@ -154,22 +147,21 @@ public string ReferencePath
#endregion
#region Member Variables
- private string homeUrl = "http://www.w3schools.com/WebServices/TempConvert.asmx";
- private string serviceUrl = "";
- private string namespacePrefix = "";
- private WebServiceDiscoveryResult selectedService;
- private string basePath = "";
+ const string homeUrl = "http://www.w3schools.com/WebServices/TempConvert.asmx";
+ WebServiceDiscoveryResult selectedService;
// protected Gtk.Alignment frmBrowserAlign;
#endregion
/// <summary>Initializes a new instance of the AddWebReferenceDialog widget.</summary>
public WebReferenceDialog (DotNetProject project)
{
- Build();
- this.basePath = Library.GetWebReferencePath (project);
+ Build ();
+ this.BasePath = Library.GetWebReferencePath (project);
this.isWebService = false;
this.project = project;
this.modified = true;
+ this.NamespacePrefix = String.Empty;
+ ServiceUrl = String.Empty;
tbxReferenceURL.Text = homeUrl;
@@ -185,7 +177,8 @@ public WebReferenceDialog (WebReferenceItem item, ClientOptions options)
Build ();
this.isWebService = true;
this.wcfOptions = options;
- this.namespacePrefix = item.Project.DefaultNamespace;
+ this.NamespacePrefix = item.Project.DefaultNamespace;
+ ServiceUrl = String.Empty;
ChangeState (DialogState.ModifyConfig);
@@ -225,7 +218,7 @@ public WebReferenceDialog (WebReferenceItem item, ClientOptions options)
// }
// }
- private void Browser_GoButtonClicked (object sender, EventArgs e)
+ void Browser_GoButtonClicked (object sender, EventArgs e)
{
modified = true;
switch (state) {
@@ -252,7 +245,7 @@ private void Browser_GoButtonClicked (object sender, EventArgs e)
/// <summary>Execute the event when the Enter key has been pressed on the Url Entry</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_URLKeyReleased (object sender, Gtk.KeyReleaseEventArgs e)
+ void Browser_URLKeyReleased (object sender, KeyReleaseEventArgs e)
{
if (e.Event.Key == Gdk.Key.Return)
{
@@ -264,94 +257,95 @@ private void Browser_URLKeyReleased (object sender, Gtk.KeyReleaseEventArgs e)
/// <summary>Execute the event when the Location of the Browser has changed</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_LocationChanged (object sender, EventArgs e)
+ void Browser_LocationChanged (object sender, EventArgs e)
{
if (browser != null) {
- this.tbxReferenceURL.Text = this.browser.Location;
- this.btnNavBack.Sensitive = browser.CanGoBack;
- this.btnNavNext.Sensitive = browser.CanGoForward;
+ tbxReferenceURL.Text = browser.Location;
+ btnNavBack.Sensitive = browser.CanGoBack;
+ btnNavNext.Sensitive = browser.CanGoForward;
// Query the current url for services
- ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), this.tbxReferenceURL.Text);
+ ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
}
void UpdateLocation ()
{
- ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), this.tbxReferenceURL.Text);
+ ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
/// <summary>Execute when the browser starts loading a document</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_StartLoading (object sender, EventArgs e)
+ void Browser_StartLoading (object sender, EventArgs e)
{
- this.btnStop.Sensitive = true;
+ btnStop.Sensitive = true;
}
/// <summary>Execute the browser stop loading a document</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_StopLoading (object sender, EventArgs e)
+ void Browser_StopLoading (object sender, EventArgs e)
{
- this.btnStop.Sensitive = false;
+ btnStop.Sensitive = false;
}
/// <summary>Execute when the Back button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_BackButtonClicked (object sender, EventArgs e)
+ void Browser_BackButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.GoBack();
+ browser.GoBack();
}
/// <summary>Execute when the Next button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_NextButtonClicked (object sender, EventArgs e)
+ void Browser_NextButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.GoForward();
+ browser.GoForward();
}
/// <summary>Execute when the Refresh button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_RefreshButtonClicked (object sender, EventArgs e)
+ void Browser_RefreshButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.Reload();
+ browser.Reload();
}
/// <summary>Execute when the Stop button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_StopButtonClicked (object sender, EventArgs e)
+ void Browser_StopButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.StopLoad();
+ browser.StopLoad();
}
/// <summary>Execute when the Home button has been clicked</summary>
/// <param name="sender">An object that contains the sender data.</param>
/// <param name="e">An EventArgs object that contains the event data.</param>
- private void Browser_HomeButtonClicked (object sender, EventArgs e)
+ void Browser_HomeButtonClicked (object sender, EventArgs e)
{
if (browser != null)
- this.browser.LoadUrl(this.homeUrl);
+ browser.LoadUrl(homeUrl);
}
+ readonly object queryLock = new object ();
/// <summary>Queries the web service to validate that the current url contains services</summary>
/// <param name="param">An object that contains the parameter being passed from the ThreadPool.</param>
- private void QueryService (object param)
+ void QueryService (object param)
{
string url = param as string;
// Set the service url
- lock (this) {
- if (serviceUrl == url)
+ lock (queryLock) {
+ if (ServiceUrl == url)
return;
- serviceUrl = url;
+ ServiceUrl = url;
}
WebServiceEngine serviceEngine;
@@ -367,9 +361,9 @@ private void QueryService (object param)
try {
service = serviceEngine.Discover (url);
} catch (Exception ex) {
- serviceUrl = null;
- this.IsWebService = false;
- this.selectedService = null;
+ ServiceUrl = null;
+ IsWebService = false;
+ selectedService = null;
LoggingService.LogError ("Error while discovering web services", ex);
ShowError (ex.Message);
return;
@@ -393,17 +387,17 @@ void ShowError (string error)
void UpdateService (WebServiceDiscoveryResult service, string url)
{
- StringBuilder text = new StringBuilder ();
+ var text = new StringBuilder ();
if (service == null) {
- this.IsWebService = false;
- this.selectedService = null;
+ IsWebService = false;
+ selectedService = null;
} else {
// Set the Default Namespace and Reference
- this.tbxNamespace.Text = this.DefaultNamespace;
+ tbxNamespace.Text = DefaultNamespace;
if (project != null) {
- string name = this.DefaultReferenceName;
+ string name = DefaultReferenceName;
var items = WebReferencesService.GetWebReferenceItems (project);
if (items.Any (it => it.Name == name)) {
@@ -412,11 +406,11 @@ void UpdateService (WebServiceDiscoveryResult service, string url)
num++;
name = name + "_" + num;
}
- this.tbxReferenceName.Text = name;
+ tbxReferenceName.Text = name;
}
- this.IsWebService = true;
- this.selectedService = service;
+ IsWebService = true;
+ selectedService = service;
if (docLabel != null) {
docLabel.Wrap = false;
@@ -425,15 +419,12 @@ void UpdateService (WebServiceDiscoveryResult service, string url)
}
if (docLabel != null) {
docLabel.Wrap = false;
- if (text.Length >= 0)
- docLabel.Markup = text.ToString ();
- else
- docLabel.Markup = GettextCatalog.GetString ("Web service not found.");
+ docLabel.Markup = text.Length >= 0 ? text.ToString () : GettextCatalog.GetString ("Web service not found.");
}
return;
}
- protected virtual void OnBtnOKClicked (object sender, System.EventArgs e)
+ protected virtual void OnBtnOKClicked (object sender, EventArgs e)
{
if (wcfConfig != null) {
wcfConfig.Update ();
@@ -441,12 +432,12 @@ protected virtual void OnBtnOKClicked (object sender, System.EventArgs e)
}
if (project == null) {
- Respond (Gtk.ResponseType.Ok);
+ Respond (ResponseType.Ok);
return;
}
- if (WebReferencesService.GetWebReferenceItems (project).Any (r => r.Name == this.tbxReferenceName.Text)) {
- MessageService.ShowError (GettextCatalog.GetString ("Web reference already exists"), GettextCatalog.GetString ("A web service reference with the name '{0}' already exists in the project. Please use a different name.", this.tbxReferenceName.Text));
+ if (WebReferencesService.GetWebReferenceItems (project).Any (r => r.Name == tbxReferenceName.Text)) {
+ MessageService.ShowError (GettextCatalog.GetString ("Web reference already exists"), GettextCatalog.GetString ("A web service reference with the name '{0}' already exists in the project. Please use a different name.", tbxReferenceName.Text));
return;
}
@@ -456,13 +447,13 @@ protected virtual void OnBtnOKClicked (object sender, System.EventArgs e)
return;
}
- Respond (Gtk.ResponseType.Ok);
+ Respond (ResponseType.Ok);
}
- protected virtual void OnComboModelChanged (object sender, System.EventArgs e)
+ protected virtual void OnComboModelChanged (object sender, EventArgs e)
{
- serviceUrl = null;
- ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), this.tbxReferenceURL.Text);
+ ServiceUrl = null;
+ ThreadPool.QueueUserWorkItem(new WaitCallback(QueryService), tbxReferenceURL.Text);
}
protected void OnBtnConfigClicked (object sender, EventArgs e)
@@ -538,7 +529,7 @@ void ChangeState (DialogState newState)
return;
if (state != DialogState.Uninitialized)
- frmBrowser.Forall (c => frmBrowser.Remove (c));
+ frmBrowser.Forall (frmBrowser.Remove);
browser = null;
browserWidget = null;
@@ -614,9 +605,9 @@ protected void OnBtnBackClicked (object sender, EventArgs e)
class AskCredentials: GuiSyncObject, ICredentials
{
- static Dictionary<string,NetworkCredential> credentials = new Dictionary<string, NetworkCredential> ();
+ static readonly Dictionary<string,NetworkCredential> credentials = new Dictionary<string, NetworkCredential> ();
- Dictionary<string,NetworkCredential> tempCredentials = new Dictionary<string, NetworkCredential> ();
+ readonly Dictionary<string,NetworkCredential> tempCredentials = new Dictionary<string, NetworkCredential> ();
public bool Canceled;
@@ -637,22 +628,20 @@ public NetworkCredential GetCredential (Uri uri, string authType)
if (tempCredentials.TryGetValue (uri.Host + uri.AbsolutePath, out nc))
return nc; // Exact match
- UserPasswordDialog dlg = new UserPasswordDialog (uri.Host);
+ var dlg = new UserPasswordDialog (uri.Host);
if (tempCredentials.TryGetValue (uri.Host, out nc) || credentials.TryGetValue (uri.Host, out nc)) {
dlg.User = nc.UserName;
dlg.Password = nc.Password;
}
try {
- if (MessageService.RunCustomDialog (dlg) == (int) ResponseType.Ok) {
+ if (MessageService.RunCustomDialog (dlg) == (int)ResponseType.Ok) {
nc = new NetworkCredential (dlg.User, dlg.Password);
tempCredentials [uri.Host + uri.AbsolutePath] = nc;
tempCredentials [uri.Host] = nc;
return nc;
}
- else {
- Canceled = true;
- return null;
- }
+ Canceled = true;
+ return null;
} finally {
dlg.Destroy ();
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
===================================================================
@@ -1,6 +1,4 @@
using System;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
using MonoDevelop.Ide.Gui.Pads.ProjectPad;
using MonoDevelop.Projects;
using MonoDevelop.Ide.Gui.Components;
@@ -20,16 +18,19 @@ public override bool CanBuildNode (Type dataType)
}
/// <summary>Get the attributes for the current node.</summary>
- /// <param name="treeNavigator">ITreeNavigator containing the tree navigator.</param>
+ /// <param name="parentNode">ITreeNavigator containing the tree navigator.</param>
/// <param name="dataObject">An object containing the value of the current node.</param>
/// <param name="attributes">A NodeAttributes reference containing all the attribute for the current node.</param>
- public override void GetNodeAttributes (ITreeNavigator treeNavigator, object dataObject, ref NodeAttributes attributes)
+ public override void GetNodeAttributes (ITreeNavigator parentNode, object dataObject, ref NodeAttributes attributes)
{
- if (treeNavigator.Options ["ShowAllFiles"])
+ if (parentNode.Options ["ShowAllFiles"])
return;
- ProjectFolder folder = dataObject as ProjectFolder;
- DotNetProject project = folder.Project as DotNetProject;
+ var folder = dataObject as ProjectFolder;
+ if (folder == null)
+ return;
+
+ var project = folder.Project as DotNetProject;
if (project == null)
return;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
===================================================================
@@ -1,10 +1,6 @@
using System;
using System.Linq;
-using System.Collections;
using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui.Pads;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.WebReferences.Commands;
using MonoDevelop.Ide.Gui.Components;
@@ -37,18 +33,18 @@ public override bool CanBuildNode (Type dataType)
public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
{
- DotNetProject project = (DotNetProject) dataObject;
+ var project = (DotNetProject) dataObject;
return WebReferencesService.GetWebReferenceItems (project).Any ();
}
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+ public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
- DotNetProject project = (DotNetProject) dataObject;
+ var project = (DotNetProject) dataObject;
if (WebReferencesService.GetWebReferenceItems (project).Any ())
- builder.AddChild (new WebReferenceFolder (project));
+ treeBuilder.AddChild (new WebReferenceFolder (project));
}
- void HandleWebReferencesServiceWebReferencesChanged (object sender, WebReferencesChangedArgs e)
+ void HandleWebReferencesServiceWebReferencesChanged (object sender, WebReferencesChangedEventArgs e)
{
ITreeBuilder builder = Context.GetTreeBuilder (e.Project);
if (builder != null)
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
===================================================================
@@ -4,7 +4,6 @@
using MonoDevelop.Ide.Gui;
using MonoDevelop.WebReferences.Commands;
using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide;
namespace MonoDevelop.WebReferences.NodeBuilders
{
@@ -65,13 +64,13 @@ public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
}
/// <summary>Add entries for all the web references in the project to the tree builder.</summary>
- /// <param name="builder">An ITreeBuilder containing all the data for the current DotNet project.</param>
+ /// <param name="treeBuilder">An ITreeBuilder containing all the data for the current DotNet project.</param>
/// <param name="dataObject">An object containing the data for the current node in the tree.</param>
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+ public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
- WebReferenceFolder folder = (WebReferenceFolder) dataObject;
+ var folder = (WebReferenceFolder) dataObject;
foreach (WebReferenceItem item in WebReferencesService.GetWebReferenceItems (folder.Project))
- builder.AddChild(item);
+ treeBuilder.AddChild(item);
}
/// <summary>Compare two object with one another and returns a number based on their sort order.</summary>
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
===================================================================
@@ -1,14 +1,5 @@
using System;
-using System.IO;
-using System.Collections;
-using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Commands;
-using MonoDevelop.Components;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Gui.Pads;
using MonoDevelop.WebReferences.Commands;
using MonoDevelop.Ide.Gui.Components;
@@ -70,9 +61,9 @@ public override bool HasChildNodes (ITreeBuilder builder, object dataObject)
}
/// <summary>Add entries for all the web references in the project to the tree builder.</summary>
- /// <param name="builder">An ITreeBuilder containing all the data for the current DotNet project.</param>
+ /// <param name="treeBuilder">An ITreeBuilder containing all the data for the current DotNet project.</param>
/// <param name="dataObject">An object containing the data for the current node in the tree.</param>
- public override void BuildChildNodes (ITreeBuilder builder, object dataObject)
+ public override void BuildChildNodes (ITreeBuilder treeBuilder, object dataObject)
{
/*
WebReferenceItem item = (WebReferenceItem) dataObject;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ClientOptions.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
using System.Collections.Generic;
namespace MonoDevelop.WebReferences.WCF
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/CollectionMapping.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ExtensionFile.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataFile.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataSource.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferenceGroup.cs
===================================================================
@@ -35,8 +35,8 @@ namespace MonoDevelop.WebReferences.WCF
public class ReferenceGroup
{
ClientOptions options = new ClientOptions ();
- List<MetadataSource> sources = new List<MetadataSource> ();
- List<MetadataFile> metadata = new List<MetadataFile> ();
+ readonly List<MetadataSource> sources = new List<MetadataSource> ();
+ readonly List<MetadataFile> metadata = new List<MetadataFile> ();
[XmlAttribute]
public string ID { get; set; }
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferencedAssembly.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System.Xml.Serialization;
-using System.Xml;
namespace MonoDevelop.WebReferences.WCF
{
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
===================================================================
@@ -48,7 +48,7 @@ class WebServiceDiscoveryResultWCF: WebServiceDiscoveryResult
MetadataSet metadata;
DiscoveryClientProtocol protocol;
ReferenceGroup refGroup;
- ClientOptions defaultOptions;
+ readonly ClientOptions defaultOptions;
public WebServiceDiscoveryResultWCF (DiscoveryClientProtocol protocol, MetadataSet metadata, WebReferenceItem item, ReferenceGroup refGroup, ClientOptions defaultOptions): base (WebReferencesService.WcfEngine, item)
{
@@ -69,14 +69,15 @@ public override FilePath GetReferencePath (DotNetProject project, string refName
public override string GetDescriptionMarkup ()
{
- StringBuilder text = new StringBuilder ();
+ var text = new StringBuilder ();
if (protocol != null) {
foreach (object dd in protocol.Documents.Values) {
if (dd is ServiceDescription) {
Library.GenerateWsdlXml (text, protocol);
break;
- } else if (dd is DiscoveryDocument) {
+ }
+ if (dd is DiscoveryDocument) {
Library.GenerateDiscoXml (text, (DiscoveryDocument)dd);
break;
}
@@ -93,17 +94,17 @@ public override string GetDescriptionMarkup ()
}
}
- protected override string GenerateDescriptionFiles (DotNetProject project, FilePath basePath)
+ protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
{
- if (!project.Items.GetAll<WCFMetadata> ().Any ()) {
- WCFMetadata met = new WCFMetadata ();
+ if (!dotNetProject.Items.GetAll<WCFMetadata> ().Any ()) {
+ var met = new WCFMetadata ();
met.Path = basePath.ParentDirectory;
- project.Items.Add (met);
+ dotNetProject.Items.Add (met);
}
- WCFMetadataStorage metStor = project.Items.GetAll<WCFMetadataStorage> ().FirstOrDefault (m => m.Path.CanonicalPath == basePath);
+ WCFMetadataStorage metStor = dotNetProject.Items.GetAll<WCFMetadataStorage> ().FirstOrDefault (m => m.Path.CanonicalPath == basePath);
if (metStor == null)
- project.Items.Add (new WCFMetadataStorage () { Path = basePath });
+ dotNetProject.Items.Add (new WCFMetadataStorage { Path = basePath });
string file = Path.Combine (basePath, "Reference.svcmap");
if (protocol != null) {
@@ -112,14 +113,14 @@ protected override string GenerateDescriptionFiles (DotNetProject project, FileP
refGroup = ConvertMapFile (file);
} else {
// TODO
- ReferenceGroup map = new ReferenceGroup ();
+ var map = new ReferenceGroup ();
map.ClientOptions = defaultOptions;
map.Save (file);
map.ID = Guid.NewGuid ().ToString ();
refGroup = map;
}
foreach (MetadataFile mfile in refGroup.Metadata)
- project.AddFile (new FilePath (mfile.FileName).ToAbsolute (basePath), BuildAction.None);
+ dotNetProject.AddFile (new FilePath (mfile.FileName).ToAbsolute (basePath), BuildAction.None);
return file;
}
@@ -130,7 +131,7 @@ public override void Update ()
if (resfile.MetadataSources.Count == 0)
return;
string url = resfile.MetadataSources [0].Address;
- WebServiceDiscoveryResultWCF wref = (WebServiceDiscoveryResultWCF) WebReferencesService.WcfEngine.Discover (url);
+ var wref = (WebServiceDiscoveryResultWCF) WebReferencesService.WcfEngine.Discover (url);
if (wref == null)
return;
@@ -139,7 +140,7 @@ public override void Update ()
GenerateFiles (Item.Project, Item.Project.DefaultNamespace, Item.Name);
}
- public override System.Collections.Generic.IEnumerable<string> GetAssemblyReferences ()
+ public override IEnumerable<string> GetAssemblyReferences ()
{
yield return "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
yield return "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
@@ -149,8 +150,8 @@ public override System.Collections.Generic.IEnumerable<string> GetAssemblyRefere
protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath basePath, string proxyNamespace, string referenceName)
{
- CodeCompileUnit ccu = new CodeCompileUnit ();
- CodeNamespace cns = new CodeNamespace (proxyNamespace);
+ var ccu = new CodeCompileUnit ();
+ var cns = new CodeNamespace (proxyNamespace);
ccu.Namespaces.Add (cns);
bool targetMoonlight = dotNetProject.TargetFramework.Id.Identifier == ("Silverlight");
@@ -160,7 +161,7 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
bool targetCoreClr = targetMoonlight || targetMonoDroid || targetMonoTouch;
bool generateSyncMethods = targetMonoDroid | targetMonoTouch;
- ServiceContractGenerator generator = new ServiceContractGenerator (ccu);
+ var generator = new ServiceContractGenerator (ccu);
generator.Options = ServiceContractGenerationOptions.ChannelInterface | ServiceContractGenerationOptions.ClientClass;
if (refGroup.ClientOptions.GenerateAsynchronousMethods || targetCoreClr)
generator.Options |= ServiceContractGenerationOptions.AsynchronousMethods;
@@ -172,22 +173,18 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
// generator.Options |= ServiceContractGenerationOptions.EventBasedAsynchronousMethods;
MetadataSet mset;
- if (protocol != null)
- mset = ToMetadataSet (protocol);
- else
- mset = metadata;
+ mset = protocol != null ? ToMetadataSet (protocol) : metadata;
CodeDomProvider code_provider = GetProvider (dotNetProject);
- List<IWsdlImportExtension> list = new List<IWsdlImportExtension> ();
+ var list = new List<IWsdlImportExtension> ();
list.Add (new TransportBindingElementImporter ());
list.Add (new XmlSerializerMessageContractImporter ());
- WsdlImporter importer = new WsdlImporter (mset);
+ var importer = new WsdlImporter (mset);
try {
ConfigureImporter (importer);
} catch {
- ;
}
Collection<ContractDescription> contracts = importer.ImportAllContracts ();
@@ -240,10 +237,10 @@ void ConfigureImporter (WsdlImporter importer)
ReferenceGroup ConvertMapFile (string mapFile)
{
- DiscoveryClientProtocol prot = new DiscoveryClientProtocol ();
+ var prot = new DiscoveryClientProtocol ();
DiscoveryClientResultCollection files = prot.ReadAll (mapFile);
- ReferenceGroup map = new ReferenceGroup ();
+ var map = new ReferenceGroup ();
if (refGroup != null) {
map.ClientOptions = refGroup.ClientOptions;
@@ -253,23 +250,23 @@ ReferenceGroup ConvertMapFile (string mapFile)
map.ID = Guid.NewGuid ().ToString ();
}
- Dictionary<string,int> sources = new Dictionary<string, int> ();
+ var sources = new Dictionary<string, int> ();
foreach (DiscoveryClientResult res in files) {
string url = res.Url;
- Uri uri = new Uri (url);
+ var uri = new Uri (url);
if (!string.IsNullOrEmpty (uri.Query))
url = url.Substring (0, url.Length - uri.Query.Length);
int nSource;
if (!sources.TryGetValue (url, out nSource)) {
nSource = sources.Count + 1;
sources [url] = nSource;
- MetadataSource ms = new MetadataSource ();
+ var ms = new MetadataSource ();
ms.Address = url;
ms.Protocol = uri.Scheme;
ms.SourceId = nSource.ToString ();
map.MetadataSources.Add (ms);
}
- MetadataFile file = new MetadataFile ();
+ var file = new MetadataFile ();
file.FileName = res.Filename;
file.ID = Guid.NewGuid ().ToString ();
file.SourceId = nSource.ToString ();
@@ -285,17 +282,17 @@ ReferenceGroup ConvertMapFile (string mapFile)
return map;
}
- MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
+ static MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
{
- MetadataSet metadata = new MetadataSet ();
+ var metadata = new MetadataSet ();
foreach (object o in prot.Documents.Values) {
if (o is System.Web.Services.Description.ServiceDescription) {
metadata.MetadataSections.Add (
- new MetadataSection (MetadataSection.ServiceDescriptionDialect, "", (System.Web.Services.Description.ServiceDescription) o));
+ new MetadataSection (MetadataSection.ServiceDescriptionDialect, "", o));
}
if (o is XmlSchema) {
metadata.MetadataSections.Add (
- new MetadataSection (MetadataSection.XmlSchemaDialect, "", (XmlSchema) o));
+ new MetadataSection (MetadataSection.XmlSchemaDialect, "", o));
}
}
@@ -305,9 +302,7 @@ MetadataSet ToMetadataSet (DiscoveryClientProtocol prot)
public override string GetServiceURL ()
{
ReferenceGroup resfile = ReferenceGroup.Read (Item.MapFile.FilePath);
- if (resfile.MetadataSources.Count == 0)
- return null;
- return resfile.MetadataSources [0].Address;
+ return resfile.MetadataSources.Count == 0 ? null : resfile.MetadataSources [0].Address;
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.WebReferences.WCF
{
public class WebServiceEngineWCF: WebServiceEngine
{
- ClientOptions defaultOptions = new ClientOptions ();
+ readonly ClientOptions defaultOptions = new ClientOptions ();
public ClientOptions DefaultClientOptions {
get { return defaultOptions; }
@@ -63,11 +63,11 @@ public override WebServiceDiscoveryResult Discover (string url)
return null;
}
- MetadataSet ResolveWithWSMex (string url)
+ static MetadataSet ResolveWithWSMex (string url)
{
MetadataSet metadata = null;
try {
- MetadataExchangeClient client = new MetadataExchangeClient (new EndpointAddress (url));
+ var client = new MetadataExchangeClient (new EndpointAddress (url));
Console.WriteLine ("\nAttempting to download metadata from {0} using WS-MetadataExchange..", url);
metadata = client.GetMetadata ();
@@ -75,10 +75,7 @@ MetadataSet ResolveWithWSMex (string url)
//MetadataExchangeClient wraps exceptions, thrown while
//fetching the metadata, in an InvalidOperationException
string msg;
- if (e.InnerException == null)
- msg = e.Message;
- else
- msg = e.InnerException.ToString ();
+ msg = e.InnerException == null ? e.Message : e.InnerException.ToString ();
Console.WriteLine ("WS-MetadataExchange query failed for the url '{0}' with exception :\n {1}",
url, msg);
@@ -110,27 +107,27 @@ public override WebServiceDiscoveryResult Load (WebReferenceItem item)
// TODO: Read as MetadataSet
- DiscoveryClientProtocol protocol = new DiscoveryClientProtocol ();
+ var protocol = new DiscoveryClientProtocol ();
foreach (MetadataFile dcr in resfile.Metadata)
{
DiscoveryReference dr;
switch (dcr.MetadataType) {
case "Wsdl":
- dr = new System.Web.Services.Discovery.ContractReference ();
+ dr = new ContractReference ();
break;
case "Disco":
- dr = new System.Web.Services.Discovery.DiscoveryDocumentReference ();
+ dr = new DiscoveryDocumentReference ();
break;
case "Schema":
- dr = new System.Web.Services.Discovery.SchemaReference ();
+ dr = new SchemaReference ();
break;
default:
continue;
}
dr.Url = dcr.SourceUrl;
- FileStream fs = new FileStream (basePath.Combine (dcr.FileName), FileMode.Open, FileAccess.Read);
+ var fs = new FileStream (basePath.Combine (dcr.FileName), FileMode.Open, FileAccess.Read);
protocol.Documents.Add (dr.Url, dr.ReadDocument (fs));
fs.Close ();
protocol.References.Add (dr.Url, dr);
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
===================================================================
@@ -24,7 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
using MonoDevelop.Projects;
using MonoDevelop.Core.Serialization;
using MonoDevelop.Core;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
===================================================================
@@ -34,7 +34,6 @@
using System.CodeDom;
using MonoDevelop.Core;
using WebReferencesDir = MonoDevelop.WebReferences.WS.WebReferences;
-using System.Collections.Generic;
namespace MonoDevelop.WebReferences.WS
{
@@ -48,7 +47,7 @@ public WebServiceDiscoveryResultWS (DiscoveryClientProtocol protocol, WebReferen
}
public DiscoveryClientProtocol Protocol {
- get { return this.protocol; }
+ get { return protocol; }
}
public override FilePath GetReferencePath (DotNetProject project, string refName)
@@ -58,12 +57,13 @@ public override FilePath GetReferencePath (DotNetProject project, string refName
public override string GetDescriptionMarkup ()
{
- StringBuilder text = new StringBuilder ();
+ var text = new StringBuilder ();
foreach (object dd in protocol.Documents.Values) {
if (dd is ServiceDescription) {
Library.GenerateWsdlXml (text, protocol);
break;
- } else if (dd is DiscoveryDocument) {
+ }
+ if (dd is DiscoveryDocument) {
Library.GenerateDiscoXml (text, (DiscoveryDocument)dd);
break;
}
@@ -77,26 +77,26 @@ public override string GetDescriptionMarkup ()
}
}
- protected override string GenerateDescriptionFiles (DotNetProject project, FilePath basePath)
+ protected override string GenerateDescriptionFiles (DotNetProject dotNetProject, FilePath basePath)
{
- if (!project.Items.GetAll<WebReferencesDir> ().Any ()) {
- WebReferencesDir met = new WebReferencesDir ();
+ if (!dotNetProject.Items.GetAll<WebReferencesDir> ().Any ()) {
+ var met = new WebReferencesDir ();
met.Path = basePath.ParentDirectory;
- project.Items.Add (met);
+ dotNetProject.Items.Add (met);
}
- WebReferenceUrl wru = project.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == basePath);
+ WebReferenceUrl wru = dotNetProject.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == basePath);
if (wru == null) {
wru = new WebReferenceUrl (protocol.Url);
wru.RelPath = basePath;
- project.Items.Add (wru);
+ dotNetProject.Items.Add (wru);
}
protocol.ResolveAll ();
DiscoveryClientResultCollection files = protocol.WriteAll (basePath, "Reference.map");
foreach (DiscoveryClientResult dr in files)
- project.AddFile (new FilePath (dr.Filename).ToAbsolute (basePath), BuildAction.None);
+ dotNetProject.AddFile (new FilePath (dr.Filename).ToAbsolute (basePath), BuildAction.None);
return Path.Combine (basePath, "Reference.map");
}
@@ -107,7 +107,7 @@ public override void Update ()
if (wru == null)
return;
- WebServiceDiscoveryResultWS wref = (WebServiceDiscoveryResultWS) WebReferencesService.WsEngine.Discover (wru.UpdateFromURL);
+ var wref = (WebServiceDiscoveryResultWS) WebReferencesService.WsEngine.Discover (wru.UpdateFromURL);
if (wref == null)
return;
@@ -128,9 +128,9 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
{
// Setup the proxy namespace and compile unit
CodeDomProvider codeProv = GetProvider (dotNetProject);
- CodeNamespace codeNamespace = new CodeNamespace (proxyNamespace);
- CodeConstructor urlConstructor = new CodeConstructor ();
- CodeCompileUnit codeUnit = new CodeCompileUnit ();
+ var codeNamespace = new CodeNamespace (proxyNamespace);
+ var urlConstructor = new CodeConstructor ();
+ var codeUnit = new CodeCompileUnit ();
codeUnit.Namespaces.Add (codeNamespace);
// Setup the importer and import the service description into the code unit
@@ -143,7 +143,7 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
if (declarationType.IsClass)
if (declarationType.BaseTypes.Count > 0)
// Is a Service Class
- if (declarationType.BaseTypes [0].BaseType.IndexOf ("SoapHttpClientProtocol") > -1) {
+ if (declarationType.BaseTypes [0].BaseType.IndexOf ("SoapHttpClientProtocol", System.StringComparison.Ordinal) > -1) {
// Create new public constructor with the Url as parameter
urlConstructor.Attributes = MemberAttributes.Public;
urlConstructor.Parameters.Add (new CodeParameterDeclarationExpression ("System.String", "url"));
@@ -156,7 +156,7 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
// Generate the code and save the file
string fileSpec = Path.Combine (basePath, dotNetProject.LanguageBinding.GetFileName (referenceName));
- StreamWriter writer = new StreamWriter (fileSpec);
+ var writer = new StreamWriter (fileSpec);
codeProv.GenerateCodeFromCompileUnit (codeUnit, writer, new CodeGeneratorOptions ());
writer.Close ();
@@ -167,10 +167,8 @@ protected override string CreateProxyFile (DotNetProject dotNetProject, FilePath
public override string GetServiceURL ()
{
WebReferenceUrl wru = Item.Project.Items.GetAll<WebReferenceUrl> ().FirstOrDefault (m => m.RelPath.CanonicalPath == Item.BasePath);
- if (wru == null)
- return null;
+ return wru == null ? null : wru.ServiceLocationURL;
- return wru.ServiceLocationURL;
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
===================================================================
@@ -43,14 +43,13 @@ public override WebServiceDiscoveryResult Discover (string url)
protocol.Url = url;
return new WebServiceDiscoveryResultWS (protocol, null);
}
- else
- return null;
+ return null;
}
public override WebServiceDiscoveryResult Load (WebReferenceItem item)
{
// Read the map file into the discovery client protocol and setup the code generator
- DiscoveryProtocol protocol = new DiscoveryProtocol ();
+ var protocol = new DiscoveryProtocol ();
protocol.ReadAllUseBasePath (item.MapFile.FilePath);
return new WebServiceDiscoveryResultWS (protocol, item);
}
@@ -95,7 +94,7 @@ public override void Delete (WebReferenceItem item)
}
- void ImportReferenceUrlItems (DotNetProject project)
+ static void ImportReferenceUrlItems (DotNetProject project)
{
FilePath refsDir = project.BaseDirectory.Combine ("Web References");
@@ -109,25 +108,28 @@ void ImportReferenceUrlItems (DotNetProject project)
string url = GetUrl (file.FilePath);
if (url == null)
continue;
- WebReferenceUrl wru = new WebReferenceUrl (url);
+ var wru = new WebReferenceUrl (url);
wru.RelPath = file.FilePath.ParentDirectory;
project.Items.Add (wru);
}
}
}
- string GetUrl (FilePath mapPath)
+ static string GetUrl (FilePath mapPath)
{
- DiscoveryProtocol protocol = new DiscoveryProtocol ();
+ var protocol = new DiscoveryProtocol ();
protocol.ReadAllUseBasePath (mapPath);
// Refresh the disco and wsdl from the server
foreach (object doc in protocol.References.Values) {
string url = null;
- if (doc is DiscoveryDocumentReference) {
- url = ((DiscoveryDocumentReference)doc).Url;
- } else if (doc is ContractReference) {
- url = ((ContractReference)doc).Url;
+ var discoveryDocumentReference = doc as DiscoveryDocumentReference;
+ if (discoveryDocumentReference != null) {
+ url = discoveryDocumentReference.Url;
+ } else {
+ var contractReference = doc as ContractReference;
+ if (contractReference != null)
+ url = contractReference.Url;
}
if (!string.IsNullOrEmpty (url))
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryNetworkCredential.cs
===================================================================
@@ -15,7 +15,7 @@ public string AuthenticationType
public bool IsDefaultAuthenticationType
{
- get { return String.Compare(authenticationType, DefaultAuthenticationType, true) == 0; }
+ get { return String.Compare (authenticationType, DefaultAuthenticationType, StringComparison.OrdinalIgnoreCase) == 0; }
}
#endregion
@@ -24,7 +24,7 @@ public bool IsDefaultAuthenticationType
#endregion
#region Member Variables
- string authenticationType = String.Empty;
+ readonly string authenticationType = String.Empty;
#endregion
public DiscoveryNetworkCredential(string userName, string password, string domain, string authenticationType) : base(userName, password, domain)
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
===================================================================
@@ -7,7 +7,7 @@ namespace MonoDevelop.WebReferences
{
/// <summary>Provides support for programmatically invoking XML Web services discovery.</summary>
[System.ComponentModel.DesignerCategory ("Code")]
- public class DiscoveryProtocol : System.Web.Services.Discovery.DiscoveryClientProtocol
+ public class DiscoveryProtocol : DiscoveryClientProtocol
{
/// <summary>
/// Reads in a file containing a map of saved discovery documents populating the Documents and References properties,
@@ -22,30 +22,30 @@ public class DiscoveryProtocol : System.Web.Services.Discovery.DiscoveryClientPr
public DiscoveryClientResultCollection ReadAllUseBasePath(string topLevelFilename)
{
string basePath = (new FileInfo(topLevelFilename)).Directory.FullName;
- StreamReader sr = new StreamReader (topLevelFilename);
- XmlSerializer ser = new XmlSerializer (typeof (DiscoveryClientResultsFile));
- DiscoveryClientResultsFile resfile = (DiscoveryClientResultsFile) ser.Deserialize (sr);
+ var sr = new StreamReader (topLevelFilename);
+ var ser = new XmlSerializer (typeof (DiscoveryClientResultsFile));
+ var resfile = (DiscoveryClientResultsFile) ser.Deserialize (sr);
sr.Close ();
foreach (DiscoveryClientResult dcr in resfile.Results)
{
// Done this cause Type.GetType(dcr.ReferenceTypeName) returned null
- Type type = null;
+ Type type;
switch (dcr.ReferenceTypeName)
{
case "System.Web.Services.Discovery.ContractReference":
- type = typeof(System.Web.Services.Discovery.ContractReference);
+ type = typeof(ContractReference);
break;
case "System.Web.Services.Discovery.DiscoveryDocumentReference":
- type = typeof(System.Web.Services.Discovery.DiscoveryDocumentReference);
+ type = typeof(DiscoveryDocumentReference);
break;
default:
continue;
}
- DiscoveryReference dr = (DiscoveryReference) Activator.CreateInstance(type);
+ var dr = (DiscoveryReference) Activator.CreateInstance(type);
dr.Url = dcr.Url;
- FileStream fs = new FileStream (Path.Combine(basePath, dcr.Filename), FileMode.Open, FileAccess.Read);
+ var fs = new FileStream (Path.Combine(basePath, dcr.Filename), FileMode.Open, FileAccess.Read);
Documents.Add (dr.Url, dr.ReadDocument (fs));
fs.Close ();
References.Add (dr.Url, dr);
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
===================================================================
@@ -5,7 +5,6 @@
using System.Net;
using System.Web.Services.Description;
using System.Web.Services.Discovery;
-using System.Xml;
using System.Xml.Schema;
using MonoDevelop.Projects;
using MonoDevelop.Core;
@@ -14,17 +13,17 @@
namespace MonoDevelop.WebReferences
{
/// <summary>A Library class containig generic static methods for Web Services.</summary>
- public class Library
+ public static class Library
{
/// <summary>Read the service description for a specified uri.</summary>
/// <param name="uri">A string containing the unique reference identifier for the service.</param>
/// <returns>A ServiceDescription for the specified uri.</returns>
public static ServiceDescription ReadServiceDescription(string uri)
{
- ServiceDescription desc = new ServiceDescription();
+ var desc = new ServiceDescription();
try
{
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
+ var request = (HttpWebRequest)WebRequest.Create(uri);
WebResponse response = request.GetResponse();
desc = ServiceDescription.Read(response.GetResponseStream());
@@ -42,16 +41,20 @@ public static ServiceDescription ReadServiceDescription(string uri)
public static ServiceDescriptionImporter ReadServiceDescriptionImporter(DiscoveryClientProtocol protocol)
{
// Service Description Importer
- ServiceDescriptionImporter importer = new ServiceDescriptionImporter();
+ var importer = new ServiceDescriptionImporter();
importer.ProtocolName = "Soap";
// Add all the schemas and service descriptions to the importer
protocol.ResolveAll ();
foreach (object doc in protocol.Documents.Values)
{
- if (doc is ServiceDescription)
- importer.AddServiceDescription((ServiceDescription)doc, null, null);
- else if (doc is XmlSchema)
- importer.Schemas.Add((XmlSchema)doc);
+ var serviceDescription = doc as ServiceDescription;
+ if (serviceDescription != null)
+ importer.AddServiceDescription (serviceDescription, null, null);
+ else {
+ var xmlSchema = doc as XmlSchema;
+ if (xmlSchema != null)
+ importer.Schemas.Add (xmlSchema);
+ }
}
return importer;
}
@@ -64,11 +67,11 @@ public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
text.Append ("<big><b>" + GettextCatalog.GetString ("Web Service References") + "</b></big>\n\n");
foreach (object oref in doc.References)
{
- DiscoveryReference dref = oref as DiscoveryReference;
+ var dref = oref as DiscoveryReference;
if (dref == null)
continue;
if (dref is ContractReference) {
- text.AppendFormat ("<b>Service: {0}</b>\n<span size='small'>{1}</span>", System.IO.Path.GetFileNameWithoutExtension (dref.DefaultFilename), dref.Url);
+ text.AppendFormat ("<b>Service: {0}</b>\n<span size='small'>{1}</span>", Path.GetFileNameWithoutExtension (dref.DefaultFilename), dref.Url);
}
else if (dref is DiscoveryDocumentReference) {
text.AppendFormat ("<b>Discovery document</b>\n<small>{0}</small>", dref.Url);
@@ -83,8 +86,8 @@ public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol protocol)
{
// Code Namespace & Compile Unit
- CodeNamespace codeNamespace = new CodeNamespace();
- CodeCompileUnit codeUnit = new CodeCompileUnit();
+ var codeNamespace = new CodeNamespace();
+ var codeUnit = new CodeCompileUnit();
codeUnit.Namespaces.Add(codeNamespace);
// Import and set the warning
@@ -103,22 +106,22 @@ public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol
foreach (CodeTypeMember mem in type.Members)
{
- CodeMemberMethod met = mem as CodeMemberMethod;
+ var met = mem as CodeMemberMethod;
if (met != null && !(mem is CodeConstructor))
{
// Method
// Asynch Begin & End Results
string returnType = met.ReturnType.BaseType;
- if (met.Name.StartsWith ("Begin") && returnType == "System.IAsyncResult")
+ if (met.Name.StartsWith ("Begin", StringComparison.Ordinal) && returnType == "System.IAsyncResult")
continue; // BeginXXX method
- if (met.Name.EndsWith ("Async"))
+ if (met.Name.EndsWith ("Async", StringComparison.Ordinal))
continue;
- if (met.Name.StartsWith ("On") && met.Name.EndsWith ("Completed"))
+ if (met.Name.StartsWith ("On", StringComparison.Ordinal) && met.Name.EndsWith ("Completed", StringComparison.Ordinal))
continue;
if (met.Parameters.Count > 0)
{
CodeParameterDeclarationExpression par = met.Parameters [met.Parameters.Count-1];
- if (met.Name.StartsWith ("End") && par.Type.BaseType == "System.IAsyncResult")
+ if (met.Name.StartsWith ("End", StringComparison.Ordinal) && par.Type.BaseType == "System.IAsyncResult")
continue; // EndXXX method
}
text.AppendFormat ("<b>{0}</b> (", met.Name);
@@ -145,7 +148,7 @@ public static void GenerateWsdlXml (StringBuilder text, DiscoveryClientProtocol
public static string GetCommentElements (CodeTypeMember member)
{
- StringBuilder coms = new StringBuilder ();
+ var coms = new StringBuilder ();
foreach (CodeCommentStatement comment in member.Comments)
{
string com = comment.Comment.Text;
@@ -156,10 +159,7 @@ public static string GetCommentElements (CodeTypeMember member)
if (com.Length > 0)
coms.Append (com);
}
- if (coms.Length > 0)
- return coms.ToString ();
- else
- return null;
+ return coms.Length > 0 ? coms.ToString () : null;
}
/// <summary>Gets the path where all web references will be stored for the specified project.</summary>
@@ -168,10 +168,7 @@ public static string GetCommentElements (CodeTypeMember member)
public static FilePath GetWebReferencePath (Project project)
{
FilePath fp = project.BaseDirectory.Combine ("WebReferences");
- if (Directory.Exists (fp))
- return fp;
- else
- return project.BaseDirectory.Combine ("Web References");
+ return Directory.Exists (fp) ? fp : project.BaseDirectory.Combine ("Web References");
}
/// <summary>Checks whether or not the current project does contain any web references.</summary>
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
===================================================================
@@ -27,17 +27,11 @@
//
using System;
using System.CodeDom;
-using System.CodeDom.Compiler;
using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
using System.Reflection;
-using System.ServiceModel;
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
using System.ServiceModel.Dispatcher;
-using System.Threading;
namespace Mono.ServiceContractTool
{
@@ -83,8 +77,8 @@ public MoonlightChannelBaseContractExtension (MoonlightChannelBaseContext mlCont
generate_sync = generateSync;
}
- MoonlightChannelBaseContext ml_context;
- bool generate_sync;
+ readonly MoonlightChannelBaseContext ml_context;
+ readonly bool generate_sync;
// IContractBehavior
public void AddBindingParameters (ContractDescription contractDescription, ServiceEndpoint endpoint, BindingParameterCollection bindingParameters)
@@ -165,7 +159,9 @@ public void Fixup ()
// protected override TChannel CreateChannel()
var creator = new CodeMemberMethod ();
creator.Name = "CreateChannel";
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
creator.Attributes = MemberAttributes.Family | MemberAttributes.Override;
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
creator.ReturnType = gt;
creator.Statements.Add (
new CodeMethodReturnStatement (
@@ -199,7 +195,7 @@ public void Fixup ()
}
}
- bool ShouldPreserveBaseTypes (CodeTypeDeclaration ct)
+ static bool ShouldPreserveBaseTypes (CodeTypeDeclaration ct)
{
foreach (CodeTypeReference cr in ct.BaseTypes) {
if (cr.BaseType == "System.ServiceModel.ClientBase`1")
@@ -279,8 +275,8 @@ public MoonlightChannelBaseOperationExtension (MoonlightChannelBaseContext mlCon
generate_sync = generateSync;
}
- MoonlightChannelBaseContext ml_context;
- bool generate_sync;
+ readonly MoonlightChannelBaseContext ml_context;
+ readonly bool generate_sync;
// IOperationBehavior
@@ -334,11 +330,13 @@ void FixupSync ()
var od = context.Operation;
// sync method implementation
- CodeMemberMethod cm = new CodeMemberMethod ();
+ var cm = new CodeMemberMethod ();
type.Members.Add (cm);
cm.Name = od.Name;
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
cm.Attributes = MemberAttributes.Public
| MemberAttributes.Final;
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
var inArgs = new List<CodeParameterDeclarationExpression > ();
@@ -379,9 +377,11 @@ public void FixupAsync ()
var asyncResultType = new CodeTypeReference (typeof (IAsyncResult));
// BeginXxx() implementation
- CodeMemberMethod cm = new CodeMemberMethod () {
+ var cm = new CodeMemberMethod {
Name = "Begin" + od.Name,
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
Attributes = MemberAttributes.Public | MemberAttributes.Final,
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
ReturnType = asyncResultType
};
type.Members.Add (cm);
@@ -405,9 +405,11 @@ public void FixupAsync ()
// EndXxx() implementation
- cm = new CodeMemberMethod () {
+ cm = new CodeMemberMethod {
Name = "End" + od.Name,
+ // Analysis disable BitwiseOperatorOnEnumWithoutFlags
Attributes = MemberAttributes.Public | MemberAttributes.Final,
+ // Analysis restore BitwiseOperatorOnEnumWithoutFlags
ReturnType = context.EndMethod.ReturnType };
type.Members.Add (cm);
@@ -434,7 +436,7 @@ public void FixupAsync ()
cm.Statements.Add (new CodeMethodReturnStatement (new CodeCastExpression (context.EndMethod.ReturnType, ret)));
}
- void AddMethodParam (CodeMemberMethod cm, Type type, string name)
+ static void AddMethodParam (CodeMemberMethod cm, Type type, string name)
{
cm.Parameters.Add (new CodeParameterDeclarationExpression (new CodeTypeReference (type), name));
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
===================================================================
@@ -1,4 +1,3 @@
-using System;
using MonoDevelop.Projects;
namespace MonoDevelop.WebReferences
@@ -16,7 +15,7 @@ public DotNetProject Project
#endregion
#region Member Variables
- private DotNetProject project;
+ readonly DotNetProject project;
#endregion
/// <summary>Initializes a new instance of the WebReferenceFolder class by specifying the parent project.</summary>
@@ -27,12 +26,11 @@ public WebReferenceFolder (DotNetProject project)
}
/// <summary>Checks if the specified other object is equal to the current object.</summary>
- /// <param name="other">An object containing the object that needs to be compared to the current object.</param>
+ /// <param name="obj">An object containing the object that needs to be compared to the current object.</param>
/// <returns>True of the other object is equal to the current object, otherwise false.</returns>
- public override bool Equals (object other)
+ public override bool Equals (object obj)
{
-
- WebReferenceFolder folder = other as WebReferenceFolder;
+ var folder = obj as WebReferenceFolder;
return folder != null && project == folder.project;
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
===================================================================
@@ -1,18 +1,5 @@
-using System;
-using System.Collections;
-using System.IO;
-using System.Linq;
-using System.Xml;
-using System.Xml.Schema;
-using System.Xml.Serialization;
-using System.Net;
-using System.Text.RegularExpressions;
-
using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui;
-using MonoDevelop.Ide.Gui.Pads;
using MonoDevelop.Core;
-using System.Collections.Generic;
namespace MonoDevelop.WebReferences
@@ -20,25 +7,23 @@ namespace MonoDevelop.WebReferences
/// <summary>Defines the properties and methods for the WebReferenceItem class.</summary>
public class WebReferenceItem
{
- DotNetProject project;
- string name;
- ProjectFile mapFile;
- WebServiceEngine engine;
+ readonly DotNetProject project;
+ readonly ProjectFile mapFile;
+ readonly WebServiceEngine engine;
- public string Name
- {
- get { return name; }
- set { name = value; }
+ public string Name {
+ get;
+ set;
}
public ProjectFile MapFile {
- get { return this.mapFile; }
+ get { return mapFile; }
}
public FilePath BasePath { get; private set; }
public DotNetProject Project {
- get { return this.project; }
+ get { return project; }
}
/// <summary>Initializes a new instance of the WebReferenceItem class.</summary>
@@ -46,7 +31,7 @@ public string Name
public WebReferenceItem (WebServiceEngine engine, DotNetProject project, string name, FilePath basePath, ProjectFile mapFile)
{
this.engine = engine;
- this.name = name;
+ this.Name = name;
this.project = project;
this.mapFile = mapFile;
BasePath = basePath.CanonicalPath;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
===================================================================
@@ -26,7 +26,6 @@
using System;
using MonoDevelop.Projects;
-using MonoDevelop.Core;
using System.Collections.Generic;
using MonoDevelop.WebReferences.WCF;
using MonoDevelop.WebReferences.WS;
@@ -53,29 +52,29 @@ public static void NotifyWebReferencesChanged (DotNetProject project)
// this event and just ensure we proxy it to the main thread.
if (MonoDevelop.Ide.DispatchService.IsGuiThread) {
if (WebReferencesChanged != null)
- WebReferencesChanged (null, new WebReferencesChangedArgs (project));
+ WebReferencesChanged (null, new WebReferencesChangedEventArgs (project));
} else {
MonoDevelop.Ide.DispatchService.GuiDispatch (() => {
if (WebReferencesChanged != null)
- WebReferencesChanged (null, new WebReferencesChangedArgs (project));
+ WebReferencesChanged (null, new WebReferencesChangedEventArgs (project));
});
}
}
- public static event EventHandler<WebReferencesChangedArgs> WebReferencesChanged;
+ public static event EventHandler<WebReferencesChangedEventArgs> WebReferencesChanged;
}
- public class WebReferencesChangedArgs: EventArgs
+ public class WebReferencesChangedEventArgs: EventArgs
{
- DotNetProject project;
+ readonly DotNetProject project;
- public WebReferencesChangedArgs (DotNetProject project)
+ public WebReferencesChangedEventArgs (DotNetProject project)
{
this.project = project;
}
public DotNetProject Project {
- get { return this.project; }
+ get { return project; }
}
}
}
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
===================================================================
@@ -36,16 +36,16 @@ namespace MonoDevelop.WebReferences
public abstract class WebServiceDiscoveryResult
{
WebReferenceItem item;
- WebServiceEngine engine;
+ readonly WebServiceEngine engine;
- public WebServiceDiscoveryResult (WebServiceEngine engine, WebReferenceItem item)
+ protected WebServiceDiscoveryResult (WebServiceEngine engine, WebReferenceItem item)
{
this.item = item;
this.engine = engine;
}
public WebReferenceItem Item {
- get { return this.item; }
+ get { return item; }
}
CodeDomProvider provider;
@@ -85,7 +85,7 @@ public virtual void GenerateFiles (DotNetProject project, string namspace, strin
Directory.CreateDirectory (basePath);
// Remove old files from the service directory
- List<ProjectFile> toRemove = new List<ProjectFile>(project.Files.GetFilesInPath (basePath));
+ var toRemove = new List<ProjectFile>(project.Files.GetFilesInPath (basePath));
foreach (ProjectFile f in toRemove)
project.Files.Remove (f);
@@ -95,13 +95,13 @@ public virtual void GenerateFiles (DotNetProject project, string namspace, strin
// Generate the proxy class
string proxySpec = CreateProxyFile (project, basePath, namspace + "." + referenceName, "Reference");
- ProjectFile mapFile = new ProjectFile (mapSpec);
+ var mapFile = new ProjectFile (mapSpec);
mapFile.BuildAction = BuildAction.None;
mapFile.Subtype = Subtype.Code;
mapFile.Generator = ProxyGenerator;
project.Files.Add (mapFile);
- ProjectFile proxyFile = new ProjectFile (proxySpec);
+ var proxyFile = new ProjectFile (proxySpec);
proxyFile.BuildAction = BuildAction.Compile;
proxyFile.Subtype = Subtype.Code;
proxyFile.DependsOn = mapFile.FilePath;
Modified: main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
===================================================================
@@ -41,7 +41,7 @@ public abstract class WebServiceEngine
public virtual void Delete (WebReferenceItem item)
{
- List<ProjectFile> toRemove = new List<ProjectFile> (item.Project.Files.GetFilesInPath (item.BasePath));
+ var toRemove = new List<ProjectFile> (item.Project.Files.GetFilesInPath (item.BasePath));
foreach (ProjectFile file in toRemove)
item.Project.Files.Remove (file);
FileService.DeleteDirectory (item.BasePath);
@@ -50,8 +50,8 @@ public virtual void Delete (WebReferenceItem item)
protected DiscoveryClientProtocol DiscoResolve (string url)
{
// Checks the availablity of any services
- DiscoveryClientProtocol protocol = new DiscoveryClientProtocol ();
- AskCredentials creds = new AskCredentials ();
+ var protocol = new DiscoveryClientProtocol ();
+ var creds = new AskCredentials ();
protocol.Credentials = creds;
bool unauthorized;
@@ -62,12 +62,12 @@ protected DiscoveryClientProtocol DiscoResolve (string url)
try {
protocol.DiscoverAny (url);
} catch (WebException wex) {
- HttpWebResponse wr = wex.Response as HttpWebResponse;
+ var wr = wex.Response as HttpWebResponse;
if (!creds.Canceled && wr != null && wr.StatusCode == HttpStatusCode.Unauthorized) {
unauthorized = true;
continue;
- } else
- throw;
+ }
+ throw;
}
} while (unauthorized);
Commit: ff079bacf7789afa724cebc98ae42a74c1821cbe
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-12 12:16:55 GMT
URL: https://github.com/mono/monodevelop/commit/ff079bacf7789afa724cebc98ae42a74c1821cbe
[Cleanup] Try and streamline most DllImports by using shared lib names.
Changed paths:
M main/src/addins/MacPlatform/MacInterop/GtkQuartz.cs
M main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GtkSpell.cs
M main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
M main/src/addins/MonoDevelop.GtkCore/libstetic/ParamSpec.cs
M main/src/addins/MonoDevelop.GtkCore/libsteticui/Metacity/Preview.cs
M main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
M main/src/addins/WindowsPlatform/GdkWin32.cs
M main/src/addins/WindowsPlatform/RecentFiles.cs
M main/src/addins/WindowsPlatform/Win32.cs
M main/src/addins/WindowsPlatform/WindowsPlatform.cs
M main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs
M main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/PangoUtil.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessExtensions.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoCairoHelper.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/GLibLogging.cs
M main/src/tools/mdmonitor/MacIntegration/MacIntegration.cs
Modified: main/src/addins/MacPlatform/MacInterop/GtkQuartz.cs
===================================================================
@@ -34,6 +34,8 @@ namespace MonoDevelop.MacInterop
{
public static class GtkQuartz
{
+ const string LIBQUARTZ = "libgtk-quartz-2.0.dylib";
+
//this may be needed to work around focusing issues in GTK/Cocoa interop
public static void FocusWindow (Gtk.Window widget)
{
@@ -79,10 +81,10 @@ public static NSView GetView (Gtk.Widget widget)
return MonoMac.ObjCRuntime.Runtime.GetNSObject (ptr) as NSView;
}
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nsview (IntPtr window);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nswindow (IntPtr window);
}
}
Modified: main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GtkSpell.cs
===================================================================
@@ -36,22 +36,23 @@ namespace MonoDevelop.Gettext.Editor
// as GtkSpell sharp looks quite old and unmaintained, here is simple wrapper
static class GtkSpell
{
+ const string LIBGTKSPELL = "libgtkspell";
static bool isSupported;
#region Native methods
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtkspell_new_attach (IntPtr textView, string locale, IntPtr error);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern void gtkspell_detach (IntPtr ptr);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern void gtkspell_recheck_all (IntPtr ptr);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtkspell_get_from_text_view (IntPtr textView);
-// [DllImport ("libgtkspell")]
+// [DllImport (LIBGTKSPELL)]
// static extern bool gtkspell_set_language (IntPtr spell, string lang, IntPtr error);
#endregion
Modified: main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
===================================================================
@@ -11,6 +11,9 @@ namespace Stetic {
public static class GladeUtils {
public const string Glade20SystemId = "http://glade.gnome.org/glade-2.0.dtd";
+ const string LIBGOBJ = "libgobject-2.0-0.dll";
+ const string LIBGLIBGLUE = "glibsharpglue-2";
+ const string LIBGTK = "libgtk-win32-2.0-0.dll";
static Gdk.Atom gladeAtom;
public static Gdk.Atom ApplicationXGladeAtom {
@@ -749,40 +752,40 @@ static public void GetSignals (ObjectWrapper wrapper, XmlElement parent_elem)
}
}
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_fundamental (IntPtr gtype);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_ref (IntPtr gtype);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_unref (IntPtr klass);
- [DllImport ("glibsharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIBGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_object_sink (IntPtr raw);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_object_get_property (IntPtr obj, string name, ref GLib.Value val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_object_set_property (IntPtr obj, string name, ref GLib.Value val);
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_container_child_get_property (IntPtr parent, IntPtr child, string name, ref GLib.Value val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_enum_get_value_by_name (IntPtr enum_class, string name);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_enum_get_value (IntPtr enum_class, int val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_flags_get_value_by_name (IntPtr flags_class, string nick);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_flags_get_first_value (IntPtr flags_class, uint val);
}
}
Modified: main/src/addins/MonoDevelop.GtkCore/libstetic/ParamSpec.cs
===================================================================
@@ -7,6 +7,7 @@
namespace Stetic {
public class ParamSpec : IDisposable {
+ const string LIBGOBJ = "libgobject-2.0-0.dll";
IntPtr _obj;
public ParamSpec (IntPtr raw)
@@ -199,31 +200,31 @@ public static ParamSpec LookupChildProperty (Type type, string name)
return pspec;
}
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_ref (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_unref (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_sink (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_name (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_nick (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_blurb (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention=CallingConvention.Cdecl)]
static extern bool g_param_value_defaults (IntPtr obj, ref GLib.Value value);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_ref (IntPtr gtype);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_object_class_find_property (IntPtr klass, string name);
[DllImport("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
Modified: main/src/addins/MonoDevelop.GtkCore/libsteticui/Metacity/Preview.cs
===================================================================
@@ -10,6 +10,7 @@ namespace Stetic.Metacity {
internal class Preview : Gtk.Bin
{
+ const string LIBMETACITY = "libmetacity-private.so.0";
static Theme theme;
public static bool ThemeError = false;
@@ -123,7 +124,7 @@ static Theme GetTheme ()
protected Preview(GLib.GType gtype) : base(gtype) {}
public Preview(IntPtr raw) : base(raw) {}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_new();
public Preview () : base (IntPtr.Zero)
@@ -135,7 +136,7 @@ public Preview () : base (IntPtr.Zero)
Raw = meta_preview_new();
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_title(IntPtr raw, IntPtr title);
public string Title {
@@ -146,7 +147,7 @@ public Preview () : base (IntPtr.Zero)
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_button_layout(IntPtr raw, ref Stetic.Metacity.ButtonLayout button_layout);
public Stetic.Metacity.ButtonLayout ButtonLayout
@@ -156,7 +157,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_theme(IntPtr raw, IntPtr theme);
public Metacity.Theme Theme {
@@ -165,7 +166,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_mini_icon();
public static Gdk.Pixbuf MiniIcon {
@@ -176,7 +177,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_icon();
public static Gdk.Pixbuf Icon {
@@ -187,7 +188,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_frame_type(IntPtr raw, int type);
public Stetic.Metacity.FrameType FrameType
@@ -197,7 +198,7 @@ public Stetic.Metacity.FrameType FrameType
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_type();
public static new GLib.GType GType {
@@ -208,7 +209,7 @@ public Stetic.Metacity.FrameType FrameType
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_frame_flags(IntPtr raw, int flags);
public Stetic.Metacity.FrameFlags FrameFlags
Modified: main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
===================================================================
@@ -7,6 +7,11 @@ namespace Stetic.Windows
{
class WindowsTheme
{
+ const string USER32 = "user32.dll";
+ const string GDI32 = "gdi32.dll";
+ const string LIBGDK = "libgdk-win32-2.0-0.dll";
+ const string UXTHEME = "uxtheme";
+ const string LIBUXTHEME = "uxtheme.dll";
IntPtr hWnd;
IntPtr hTheme;
@@ -83,56 +88,56 @@ public Gdk.Rectangle GetWindowClientArea (Gdk.Rectangle allocation)
const int DT_SINGLELINE = 0x20;
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 DrawThemeBackground (IntPtr hTheme, IntPtr hdc, int iPartId,
int iStateId, ref RECT pRect, ref RECT pClipRect);
- [DllImport ("uxtheme.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (LIBUXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
static extern IntPtr OpenThemeData (IntPtr hWnd, String classList);
- [DllImport ("uxtheme.dll", ExactSpelling = true)]
+ [DllImport (LIBUXTHEME, ExactSpelling = true)]
extern static Int32 CloseThemeData (IntPtr hTheme);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemePartSize (IntPtr hTheme, IntPtr hdc, int part, int state, ref RECT pRect, int eSize, out SIZE size);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemeBackgroundExtent (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pBoundingRect, out RECT pContentRect);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemeMargins (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, int iPropId, out MARGINS pMargins);
- [DllImport ("uxtheme", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
extern static Int32 DrawThemeText (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, String text, int textLength, UInt32 textFlags, UInt32 textFlags2, ref RECT pRect);
- [DllImport ("uxtheme", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
extern static Int32 GetThemeSysFont (IntPtr hTheme, int iFontId, ref LOGFONT plf);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern IntPtr CreateFontIndirect ([In] ref LOGFONT lplf);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern int SetBkMode (IntPtr hdc, int iBkMode);
- [DllImport ("gdi32.dll", ExactSpelling = true, PreserveSig = true, SetLastError = true)]
+ [DllImport (GDI32, ExactSpelling = true, PreserveSig = true, SetLastError = true)]
static extern IntPtr SelectObject (IntPtr hdc, IntPtr hgdiobj);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern bool DeleteObject (IntPtr hObject);
- [DllImport ("user32.dll")]
+ [DllImport (USER32)]
static extern IntPtr GetDC (IntPtr hWnd);
- [DllImport ("user32.dll")]
+ [DllImport (USER32)]
static extern int ReleaseDC (IntPtr hWnd, IntPtr hDC);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr raw);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_hdc_get (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_win32_hdc_release (IntPtr drawable, IntPtr gc, int usage);
}
Modified: main/src/addins/WindowsPlatform/GdkWin32.cs
===================================================================
@@ -32,27 +32,29 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Microsoft.WindowsAPICodePack.Dialogs;
-using MonoDevelop.Core;
+using MonoDevelop.Core;
+using CustomControls.OS;
namespace MonoDevelop.Platform
{
public static class GdkWin32
{
static readonly uint GotGdkEventsMessage = RegisterWindowMessage ("GDK_WIN32_GOT_EVENTS");
+ internal const string LIBGDK = "libgdk-win32-2.0-0.dll";
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr drawable);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_hdc_get (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_win32_hdc_release (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_set_modal_dialog_libgtk_only (IntPtr window);
- [DllImport ("User32.dll", SetLastError=true, CharSet=CharSet.Auto)]
+ [DllImport (Win32.USER32, SetLastError=true, CharSet=CharSet.Auto)]
static extern uint RegisterWindowMessage (string lpString);
public static IntPtr HgdiobjGet (Gdk.Drawable drawable)
@@ -191,7 +193,7 @@ static void ClearGtkDialogHook (IntPtr hdlg)
static readonly WindowProc GtkWindowProcDelegate = GtkWindowProc;
static readonly int DWLP_DLGPROC = IntPtr.Size; // DWLP_MSGRESULT + sizeof(LRESULT);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
static extern IntPtr CallWindowProc (IntPtr lpPrevWndFunc, IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
static IntPtr SetWindowLongPtr (IntPtr hWnd, int nIndex, IntPtr dwNewLong)
@@ -201,10 +203,10 @@ static IntPtr SetWindowLongPtr (IntPtr hWnd, int nIndex, IntPtr dwNewLong)
return SetWindowLongPtr64 (hWnd, nIndex, dwNewLong);
}
- [DllImport ("user32.dll", EntryPoint="SetWindowLongPtr")]
+ [DllImport (Win32.USER32, EntryPoint="SetWindowLongPtr")]
static extern IntPtr SetWindowLongPtr64 (IntPtr hWnd, int nIndex, IntPtr dwNewLong);
- [DllImport("user32.dll", EntryPoint="SetWindowLong")]
+ [DllImport(Win32.USER32, EntryPoint="SetWindowLong")]
static extern IntPtr SetWindowLongPtr32 (IntPtr hWnd, int nIndex, IntPtr dwNewLong);
static IntPtr GetWindowLongPtr (IntPtr hWnd, int nIndex)
@@ -214,10 +216,10 @@ static IntPtr GetWindowLongPtr (IntPtr hWnd, int nIndex)
return GetWindowLongPtr64 (hWnd, nIndex);
}
- [DllImport ("user32.dll", EntryPoint="GetWindowLongPtr")]
+ [DllImport (Win32.USER32, EntryPoint="GetWindowLongPtr")]
static extern IntPtr GetWindowLongPtr64 (IntPtr hWnd, int nIndex);
- [DllImport("user32.dll", EntryPoint="GetWindowLong")]
+ [DllImport(Win32.USER32, EntryPoint="GetWindowLong")]
static extern IntPtr GetWindowLongPtr32 (IntPtr hWnd, int nIndex);
delegate IntPtr WindowProc (IntPtr hdlg, uint uiMsg, IntPtr wParam, IntPtr lParam);
Modified: main/src/addins/WindowsPlatform/RecentFiles.cs
===================================================================
@@ -29,6 +29,7 @@
using MonoDevelop.Core;
using MonoDevelop.Ide.Desktop;
using System.Collections.Generic;
+using CustomControls.OS;
namespace MonoDevelop.Platform
{
@@ -52,10 +53,10 @@ public override void AddProject (string fileName, string displayName)
base.AddProject (fileName, displayName);
}
- [DllImport ("Shell32.dll", CharSet = CharSet.Unicode)]
+ [DllImport (Win32.SHELL32, CharSet = CharSet.Unicode)]
static extern void SHAddToRecentDocs (SHARD uFlags, string pv);
- [DllImport ("Shell32.dll", CharSet = CharSet.Unicode)]
+ [DllImport (Win32.SHELL32, CharSet = CharSet.Unicode)]
static extern void SHAddToRecentDocs (SHARD uFlags, IntPtr pv);
enum SHARD : uint
Modified: main/src/addins/WindowsPlatform/Win32.cs
===================================================================
@@ -34,65 +34,67 @@ public static class Win32
public const uint SHGFI_TYPENAME = 0x400;
public const uint SHGFI_USEFILEATTRIBUTES = 0x10;
public const uint FILE_ATTRIBUTES_NORMAL = 0x80;
+ internal const string USER32 = "user32.dll";
+ internal const string SHELL32 = "shell32.dll";
#region Delegates
public delegate bool EnumWindowsCallBack(IntPtr hWnd, int lParam);
#endregion
#region USER32
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr GetParent(IntPtr hWnd);
- [DllImport("User32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern int GetDlgCtrlID(IntPtr hWndCtl);
- [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto, ExactSpelling = true)]
public static extern int MapWindowPoints(IntPtr hWnd, IntPtr hWndTo, ref POINT pt, int cPoints);
- [DllImport("user32.dll", SetLastError = true)]
+ [DllImport(Win32.USER32, SetLastError = true)]
public static extern bool GetWindowInfo(IntPtr hwnd, out WINDOWINFO pwi);
- [DllImport("User32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern void GetWindowText(IntPtr hWnd, StringBuilder param, int length);
- [DllImport("User32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern void GetClassName(IntPtr hWnd, StringBuilder param, int length);
- [DllImport("user32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern bool EnumChildWindows(IntPtr hWndParent, EnumWindowsCallBack lpEnumFunc, int lParam);
- [DllImport("user32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern bool EnumWindows(EnumWindowsCallBack lpEnumFunc, int lParam);
- [DllImport("User32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern bool ReleaseCapture();
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr SetCapture(IntPtr hWnd);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr ChildWindowFromPointEx(IntPtr hParent, POINT pt, ChildFromPointFlags flags);
- [DllImport("user32.dll", EntryPoint = "FindWindowExA", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
+ [DllImport(Win32.USER32, EntryPoint = "FindWindowExA", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int PostMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int PostMessage(IntPtr hWnd, int msg, int wParam, int lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, int lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, StringBuilder param);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, char[] chars);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr BeginDeferWindowPos(int nNumWindows);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr DeferWindowPos(IntPtr hWinPosInfo, IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int Width, int Height, SetWindowPosFlags flags);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern bool EndDeferWindowPos(IntPtr hWinPosInfo);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int Width, int Height, SetWindowPosFlags flags);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern bool GetWindowRect(IntPtr hwnd, ref RECT rect);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern bool GetClientRect(IntPtr hwnd, ref RECT rect);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern bool DestroyIcon([In] IntPtr hIcon);
- [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+ [DllImport(Win32.SHELL32, CharSet = CharSet.Unicode)]
public static extern IntPtr SHGetFileInfoW([In] string pszPath, uint dwFileAttributes, [In, Out] ref SHFILEINFO psfi, uint cbSizeFileInfo, uint uFlags);
#endregion
}
Modified: main/src/addins/WindowsPlatform/WindowsPlatform.cs
===================================================================
@@ -163,10 +163,10 @@ unsafe struct MonitorInfo {
[UnmanagedFunctionPointer (CallingConvention.Winapi)]
delegate int EnumMonitorsCallback (IntPtr hmonitor, IntPtr hdc, IntPtr prect, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (Win32.USER32)]
extern static int EnumDisplayMonitors (IntPtr hdc, IntPtr clip, EnumMonitorsCallback callback, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (Win32.USER32)]
extern static int GetMonitorInfoA (IntPtr hmonitor, ref MonitorInfo info);
public override Gdk.Rectangle GetUsableMonitorGeometry (Gdk.Screen screen, int monitor_id)
Modified: main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs
===================================================================
@@ -148,27 +148,30 @@ public override DialogResult ShowMagicDialog ()
static class Native
{
- [DllImport ("ole32.dll")]
+ const string OLE32 = "ole32.dll";
+ const string CREDUI = "credui.dll";
+
+ [DllImport (OLE32)]
internal static extern void CoTaskMemFree (IntPtr ptr);
- [DllImport ("credui.dll")]
+ [DllImport (CREDUI)]
internal static extern CredUiReturnCodes CredUIPromptForCredentials (ref CredentialUiInfo uiInfo, string targetName,
IntPtr reserved1, int iError, StringBuilder userName, int maxUserName, StringBuilder password, int maxPassword,
[MarshalAs (UnmanagedType.Bool)] ref bool pfSave, CredentialsUiFlags windowsFlags);
- [DllImport ("credui.dll", CharSet = CharSet.Unicode)]
+ [DllImport (CREDUI, CharSet = CharSet.Unicode)]
internal static extern WindowsCredentialPromptReturnCode CredUIPromptForWindowsCredentials (ref CredentialUiInfo uiInfo,
int authError, ref int authPackage, IntPtr inAuthBuffer, uint inAuthBufferSize,
out IntPtr refOutAuthBuffer, out int refOutAuthBufferSize, ref bool fSave,
CredentialsUiWindowsFlags uiWindowsFlags);
- [DllImport ("credui.dll", CharSet = CharSet.Auto)]
+ [DllImport (CREDUI, CharSet = CharSet.Auto)]
internal static extern bool CredUnPackAuthenticationBuffer (int dwFlags, IntPtr pAuthBuffer,
int cbAuthBuffer, StringBuilder pszUserName, ref int pcchMaxUserName,
StringBuilder pszDomainName, ref int pcchMaxDomainame, StringBuilder pszPassword,
ref int pcchMaxPassword);
- [DllImport ("credui.dll", CharSet = CharSet.Auto)]
+ [DllImport (CREDUI, CharSet = CharSet.Auto)]
internal static extern bool CredPackAuthenticationBuffer (int dwFlags, string pszUserName, string pszPassword,
IntPtr packedCredentials, ref uint packedCredentialsLength);
Modified: main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs
===================================================================
@@ -252,14 +252,16 @@ override protected bool ReleaseHandle ()
static class NativeMethods
{
- [DllImport ("advapi32.dll", CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredWriteW")]
+ const string ADVAPI32 = "advapi32.dll";
+
+ [DllImport (ADVAPI32, CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredWriteW")]
internal static extern bool CredWrite ([In] ref NativeCredential credential, [In] uint flags);
- [DllImport ("advapi32.dll", CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredReadW")]
+ [DllImport (ADVAPI32, CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredReadW")]
internal static extern bool CredRead (string targetName, NativeCredentialType type, CredentialFlags flags,
out IntPtr credential);
- [DllImport ("advapi32.dll", CharSet = CharSet.Unicode, EntryPoint = "CredFree")]
+ [DllImport (ADVAPI32, CharSet = CharSet.Unicode, EntryPoint = "CredFree")]
internal static extern bool CredFree ([In] IntPtr cred);
}
}
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
===================================================================
@@ -37,6 +37,7 @@ namespace Mono.TextEditor
public static class GtkWorkarounds
{
const string LIBOBJC ="/usr/lib/libobjc.dylib";
+ const string USER32DLL = "User32.dll";
[DllImport (LIBOBJC, EntryPoint = "sel_registerName")]
static extern IntPtr sel_registerName (string selector);
@@ -71,7 +72,7 @@ public static class GtkWorkarounds
[DllImport (LIBOBJC, EntryPoint = "objc_msgSend_stret")]
static extern void objc_msgSend_CGRect64 (out CGRect64 rect, IntPtr klass, IntPtr selector);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nswindow (IntPtr window);
struct CGRect32
@@ -259,10 +260,10 @@ unsafe struct MonitorInfo {
[UnmanagedFunctionPointer (CallingConvention.Winapi)]
delegate int EnumMonitorsCallback (IntPtr hmonitor, IntPtr hdc, IntPtr prect, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (USER32DLL)]
extern static int EnumDisplayMonitors (IntPtr hdc, IntPtr clip, EnumMonitorsCallback callback, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (USER32DLL)]
extern static int GetMonitorInfoA (IntPtr hmonitor, ref MonitorInfo info);
static Gdk.Rectangle WindowsGetUsableMonitorGeometry (Gdk.Screen screen, int monitor_id)
@@ -735,7 +736,7 @@ public static void MapRawKeys (Gdk.EventKey evt, out Gdk.Key key, out Gdk.Modifi
mod = accels[0].Modifier;
}
- [System.Runtime.InteropServices.DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [System.Runtime.InteropServices.DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr drawable);
enum DwmWindowAttribute
@@ -774,7 +775,7 @@ public Win32Rect (int left, int top, int right, int bottom)
[DllImport ("dwmapi.dll")]
static extern int DwmIsCompositionEnabled (out bool enabled);
- [DllImport ("User32.dll")]
+ [DllImport (USER32DLL)]
static extern bool GetWindowRect (IntPtr hwnd, out Win32Rect rect);
public static void SetImCursorLocation (Gtk.IMContext ctx, Gdk.Window clientWindow, Gdk.Rectangle cursor)
@@ -832,7 +833,7 @@ public static void UpdateNativeShadow (Gtk.Window window)
objc_msgSend_IntPtr (ptr, sel_invalidateShadow);
}
- [DllImport ("gtksharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (PangoUtil.LIBGTKGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern void gtksharp_container_leak_fixed_marker ();
static HashSet<Type> fixedContainerTypes;
@@ -984,7 +985,7 @@ static ForallDelegate CreateForallCallback (IntPtr gtype)
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
- [DllImport("gtksharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBGTKGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
public static string MarkupLinks (string text)
@@ -1037,10 +1038,10 @@ class ActivateLinkEventArgs : GLib.SignalArgs
static bool canSetOverlayScrollbarPolicy = true;
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_scrolled_window_set_overlay_policy (IntPtr sw, Gtk.PolicyType hpolicy, Gtk.PolicyType vpolicy);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_scrolled_window_get_overlay_policy (IntPtr sw, out Gtk.PolicyType hpolicy, out Gtk.PolicyType vpolicy);
public static void SetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, Gtk.PolicyType hpolicy, Gtk.PolicyType vpolicy)
@@ -1072,7 +1073,7 @@ public static void GetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, out Gtk.Pol
canSetOverlayScrollbarPolicy = false;
}
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_view_get_tooltip_context (IntPtr raw, ref int x, ref int y, bool keyboard_tip, out IntPtr model, out IntPtr path, IntPtr iter);
//the GTK# version of this has 'out' instead of 'ref', preventing passing the x,y values in
@@ -1092,10 +1093,10 @@ public static void GetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, out Gtk.Pol
static bool supportsHiResIcons = false; // Disabled for now
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_icon_source_set_scale (IntPtr source, double scale);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_icon_source_set_scale_wildcarded (IntPtr source, bool setting);
[DllImport (PangoUtil.LIBGTK)]
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/PangoUtil.cs
===================================================================
@@ -39,6 +39,8 @@ public static class PangoUtil
internal const string LIBGOBJECT = "libgobject-2.0-0.dll";
internal const string LIBPANGO = "libpango-1.0-0.dll";
internal const string LIBPANGOCAIRO = "libpangocairo-1.0-0.dll";
+ internal const string LIBQUARTZ = "libgtk-quartz-2.0.dylib";
+ internal const string LIBGTKGLUE = "gtksharpglue-2";
/// <summary>
/// This doesn't leak Pango layouts, unlike some other ways to create them in GTK# <= 2.12.11
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
===================================================================
@@ -69,7 +69,7 @@ public static IEnumerable<TextSegment> AdjustSegments (this IEnumerable<TextSegm
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
public static void ShowLayout (this Cairo.Context cr, Pango.Layout layout)
@@ -77,7 +77,7 @@ public static void ShowLayout (this Cairo.Context cr, Pango.Layout layout)
pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_cairo_create_layout (IntPtr cr);
public static Pango.Layout CreateLayout (this Cairo.Context cr)
@@ -86,7 +86,7 @@ public static Pango.Layout CreateLayout (this Cairo.Context cr)
return GLib.Object.GetObject (raw_ret) as Pango.Layout;
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
@@ -94,7 +94,7 @@ public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
public static void ContextSetResolution (this Pango.Context context, double dpi)
@@ -102,7 +102,7 @@ public static void ContextSetResolution (this Pango.Context context, double dpi)
pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_layout_get_context (IntPtr layout);
public static string GetColorString (Gdk.Color color)
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessExtensions.cs
===================================================================
@@ -88,7 +88,7 @@ static IEnumerable<int> GetAllChildren (Dictionary<int,List<int>> procRelations,
return procRelations;
}
- static uint TH32CS_SNAPPROCESS = 2;
+ const uint TH32CS_SNAPPROCESS = 2;
[StructLayout(LayoutKind.Sequential)]
public struct PROCESSENTRY32
@@ -106,13 +106,14 @@ public struct PROCESSENTRY32
public string szExeFile;
};
- [DllImport("kernel32.dll", SetLastError = true)]
+ const string kernel = "kernel32.dll";
+ [DllImport(kernel, SetLastError = true)]
static extern IntPtr CreateToolhelp32Snapshot (uint dwFlags, uint th32ProcessID);
- [DllImport("kernel32.dll")]
+ [DllImport(kernel)]
static extern bool Process32First (IntPtr hSnapshot, ref PROCESSENTRY32 lppe);
- [DllImport("kernel32.dll")]
+ [DllImport(kernel)]
static extern bool Process32Next (IntPtr hSnapshot, ref PROCESSENTRY32 lppe);
}
}
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
===================================================================
@@ -40,7 +40,9 @@
namespace MonoDevelop.Projects.Text
{
public class TextFile: IEditableTextFile
- {
+ {
+ const string LIBGLIB = "libglib-2.0-0.dll";
+
FilePath name;
StringBuilder text;
string sourceEncoding;
@@ -235,16 +237,16 @@ static byte[] ConvertToBytes (byte[] content, long nread, string toEncoding, str
throw ex;
}
}
-
- [DllImport("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+
+ [DllImport(LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
//note: textLength is signed, read/written are not
static extern IntPtr g_convert(byte[] text, IntPtr textLength, string toCodeset, string fromCodeset,
ref IntPtr read, ref IntPtr written, ref IntPtr err);
- [DllImport("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_free (IntPtr ptr);
- [DllImport("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_error_free (IntPtr err);
#endregion
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
===================================================================
@@ -50,6 +50,7 @@ public enum CairoCorners
public static class CairoExtensions
{
+ internal const string LIBCAIRO = "libcairo-2.dll";
public static Cairo.Rectangle ToCairoRect (this Gdk.Rectangle rect)
{
return new Cairo.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
@@ -421,10 +422,10 @@ public static void RenderOuterShadow (this Cairo.Context self, Gdk.Rectangle are
}
}
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_pattern_set_extend(IntPtr pattern, CairoExtend extend);
- [DllImport ("libcairo-2.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention=CallingConvention.Cdecl)]
internal static extern IntPtr cairo_get_source (IntPtr cr);
enum CairoExtend {
@@ -488,7 +489,7 @@ private static bool CallCairoMethod (Cairo.Context cr, ref CairoInteropCall call
private static bool native_push_pop_exists = true;
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
private static extern void cairo_push_group (IntPtr ptr);
private static CairoInteropCall cairo_push_group_call = new CairoInteropCall ("PushGroup");
@@ -507,7 +508,7 @@ public static void PushGroup (Cairo.Context cr)
}
}
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
private static extern void cairo_pop_group_to_source (IntPtr ptr);
private static CairoInteropCall cairo_pop_group_to_source_call = new CairoInteropCall ("PopGroupToSource");
@@ -666,13 +667,13 @@ public class QuartzSurface : Cairo.Surface
{
const string CoreGraphics = "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/CoreGraphics";
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (CairoExtensions.LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_quartz_surface_create (Cairo.Format format, uint width, uint height);
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (CairoExtensions.LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_quartz_surface_get_cg_context (IntPtr surface);
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (CairoExtensions.LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_get_target (IntPtr context);
[DllImport (CoreGraphics, EntryPoint="CGContextConvertRectToDeviceSpace", CallingConvention = CallingConvention.Cdecl)]
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoCairoHelper.cs
===================================================================
@@ -33,7 +33,8 @@ namespace MonoDevelop.Components
{
public static class PangoCairoHelper
{
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ const string LIBPANGOCAIRO = "libpangocairo-1.0-0.dll";
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
public static void ShowLayout (Cairo.Context cr, Pango.Layout layout)
@@ -41,7 +42,7 @@ public static void ShowLayout (Cairo.Context cr, Pango.Layout layout)
pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern IntPtr pango_cairo_create_layout (IntPtr cr);
public static Pango.Layout CreateLayout (Cairo.Context cr)
@@ -50,7 +51,7 @@ public static Pango.Layout CreateLayout (Cairo.Context cr)
return GLib.Object.GetObject (raw_ret) as Pango.Layout;
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
public static void LayoutPath (Cairo.Context cr, Pango.Layout layout, bool iUnderstandThePerformanceImplications)
@@ -58,7 +59,7 @@ public static void LayoutPath (Cairo.Context cr, Pango.Layout layout, bool iUnde
pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
public static void ContextSetResolution (Pango.Context context, double dpi)
@@ -66,7 +67,7 @@ public static void ContextSetResolution (Pango.Context context, double dpi)
pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern IntPtr pango_layout_get_context (IntPtr layout);
public static string GetColorString (Gdk.Color color)
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/GLibLogging.cs
===================================================================
@@ -72,7 +72,7 @@ public enum LogLevelFlags : int
public class Log
{
-
+ const string LIBGLIB = "libglib-2.0-0.dll";
static Hashtable handlers;
static void EnsureHash ()
@@ -81,7 +81,7 @@ static void EnsureHash ()
handlers = new Hashtable ();
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_logv (IntPtr log_domain, LogLevelFlags flags, IntPtr message);
public void WriteLog (string logDomain, LogLevelFlags flags, string format, params object[] args)
@@ -93,7 +93,7 @@ public void WriteLog (string logDomain, LogLevelFlags flags, string format, para
GLib.Marshaller.Free (nmessage);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern uint g_log_set_handler (IntPtr log_domain, LogLevelFlags flags, LogFunc2 log_func, LogFunc user_data);
static readonly LogFunc2 LogFuncTrampoline = (string domain, LogLevelFlags level, string message, LogFunc user_data) => {
@@ -111,7 +111,7 @@ public static uint SetLogHandler (string logDomain, LogLevelFlags flags, LogFunc
return result;
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern uint g_log_remove_handler (IntPtr log_domain, uint handler_id);
public static void RemoveLogHandler (string logDomain, uint handlerID)
@@ -125,7 +125,7 @@ public static void RemoveLogHandler (string logDomain, uint handlerID)
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern PrintFunc g_set_print_handler (PrintFunc handler);
public static PrintFunc SetPrintHandler (PrintFunc handler)
@@ -136,7 +136,7 @@ public static PrintFunc SetPrintHandler (PrintFunc handler)
return g_set_print_handler (handler);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern PrintFunc g_set_printerr_handler (PrintFunc handler);
public static PrintFunc SetPrintErrorHandler (PrintFunc handler)
@@ -147,7 +147,7 @@ public static PrintFunc SetPrintErrorHandler (PrintFunc handler)
return g_set_printerr_handler (handler);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_log_default_handler (IntPtr log_domain, LogLevelFlags log_level, IntPtr message, IntPtr unused_data);
public static void DefaultHandler (string logDomain, LogLevelFlags logLevel, string message)
@@ -159,7 +159,7 @@ public static void DefaultHandler (string logDomain, LogLevelFlags logLevel, str
GLib.Marshaller.Free (nmess);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
extern static LogLevelFlags g_log_set_always_fatal (LogLevelFlags fatal_mask);
public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask)
@@ -167,7 +167,7 @@ public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask)
return g_log_set_always_fatal (fatalMask);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
extern static LogLevelFlags g_log_set_fatal_mask (IntPtr log_domain, LogLevelFlags fatal_mask);
public static LogLevelFlags SetAlwaysFatal (string logDomain, LogLevelFlags fatalMask)
Modified: main/src/tools/mdmonitor/MacIntegration/MacIntegration.cs
===================================================================
@@ -31,9 +31,11 @@
namespace MacIntegration
{
- public class IgeMacMenu
+ public static class IgeMacMenu
{
- [DllImport("libigemacintegration.dylib")]
+ internal const string maclib = "libigemacintegration.dylib";
+
+ [DllImport(maclib)]
static extern void ige_mac_menu_connect_window_key_handler (IntPtr window);
public static void ConnectWindowKeyHandler (Gtk.Window window)
@@ -41,7 +43,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
ige_mac_menu_connect_window_key_handler (window.Handle);
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern void ige_mac_menu_set_global_key_handler_enabled (bool enabled);
public static bool GlobalKeyHandlerEnabled {
@@ -50,7 +52,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
}
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern void ige_mac_menu_set_menu_bar (IntPtr menu_shell);
public static Gtk.MenuShell MenuBar {
@@ -59,7 +61,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
}
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern void ige_mac_menu_set_quit_menu_item (IntPtr quit_item);
public static Gtk.MenuItem QuitMenuItem {
@@ -68,7 +70,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
}
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern IntPtr ige_mac_menu_add_app_menu_group ();
public static IgeMacMenuGroup AddAppMenuGroup ()
@@ -81,7 +83,7 @@ public static IgeMacMenuGroup AddAppMenuGroup ()
public class IgeMacMenuGroup : GLib.Opaque
{
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(IgeMacMenu.maclib)]
static extern void ige_mac_menu_add_app_menu_item (IntPtr raw, IntPtr menu_item, IntPtr label);
public void AddMenuItem (Gtk.MenuItem menu_item, string label)
Commit: 459bb278e5ea484d6c7904ba176ef632e4d95436
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-12 14:35:09 GMT
URL: https://github.com/mono/monodevelop/commit/459bb278e5ea484d6c7904ba176ef632e4d95436
Merge pull request #429 from mono/streamlineDllImport
[Cleanup] Try and streamline most DllImports by using shared lib names.
Changed paths:
M main/src/addins/MacPlatform/MacInterop/GtkQuartz.cs
M main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GtkSpell.cs
M main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
M main/src/addins/MonoDevelop.GtkCore/libstetic/ParamSpec.cs
M main/src/addins/MonoDevelop.GtkCore/libsteticui/Metacity/Preview.cs
M main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
M main/src/addins/WindowsPlatform/GdkWin32.cs
M main/src/addins/WindowsPlatform/RecentFiles.cs
M main/src/addins/WindowsPlatform/Win32.cs
M main/src/addins/WindowsPlatform/WindowsPlatform.cs
M main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs
M main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/PangoUtil.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessExtensions.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoCairoHelper.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/GLibLogging.cs
M main/src/tools/mdmonitor/MacIntegration/MacIntegration.cs
Modified: main/src/addins/MacPlatform/MacInterop/GtkQuartz.cs
===================================================================
@@ -34,6 +34,8 @@ namespace MonoDevelop.MacInterop
{
public static class GtkQuartz
{
+ const string LIBQUARTZ = "libgtk-quartz-2.0.dylib";
+
//this may be needed to work around focusing issues in GTK/Cocoa interop
public static void FocusWindow (Gtk.Window widget)
{
@@ -79,10 +81,10 @@ public static NSView GetView (Gtk.Widget widget)
return MonoMac.ObjCRuntime.Runtime.GetNSObject (ptr) as NSView;
}
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nsview (IntPtr window);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nswindow (IntPtr window);
}
}
Modified: main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GtkSpell.cs
===================================================================
@@ -36,22 +36,23 @@ namespace MonoDevelop.Gettext.Editor
// as GtkSpell sharp looks quite old and unmaintained, here is simple wrapper
static class GtkSpell
{
+ const string LIBGTKSPELL = "libgtkspell";
static bool isSupported;
#region Native methods
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtkspell_new_attach (IntPtr textView, string locale, IntPtr error);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern void gtkspell_detach (IntPtr ptr);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern void gtkspell_recheck_all (IntPtr ptr);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtkspell_get_from_text_view (IntPtr textView);
-// [DllImport ("libgtkspell")]
+// [DllImport (LIBGTKSPELL)]
// static extern bool gtkspell_set_language (IntPtr spell, string lang, IntPtr error);
#endregion
Modified: main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
===================================================================
@@ -11,6 +11,9 @@ namespace Stetic {
public static class GladeUtils {
public const string Glade20SystemId = "http://glade.gnome.org/glade-2.0.dtd";
+ const string LIBGOBJ = "libgobject-2.0-0.dll";
+ const string LIBGLIBGLUE = "glibsharpglue-2";
+ const string LIBGTK = "libgtk-win32-2.0-0.dll";
static Gdk.Atom gladeAtom;
public static Gdk.Atom ApplicationXGladeAtom {
@@ -749,40 +752,40 @@ static public void GetSignals (ObjectWrapper wrapper, XmlElement parent_elem)
}
}
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_fundamental (IntPtr gtype);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_ref (IntPtr gtype);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_unref (IntPtr klass);
- [DllImport ("glibsharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIBGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_object_sink (IntPtr raw);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_object_get_property (IntPtr obj, string name, ref GLib.Value val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_object_set_property (IntPtr obj, string name, ref GLib.Value val);
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_container_child_get_property (IntPtr parent, IntPtr child, string name, ref GLib.Value val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_enum_get_value_by_name (IntPtr enum_class, string name);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_enum_get_value (IntPtr enum_class, int val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_flags_get_value_by_name (IntPtr flags_class, string nick);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_flags_get_first_value (IntPtr flags_class, uint val);
}
}
Modified: main/src/addins/MonoDevelop.GtkCore/libstetic/ParamSpec.cs
===================================================================
@@ -7,6 +7,7 @@
namespace Stetic {
public class ParamSpec : IDisposable {
+ const string LIBGOBJ = "libgobject-2.0-0.dll";
IntPtr _obj;
public ParamSpec (IntPtr raw)
@@ -199,31 +200,31 @@ public static ParamSpec LookupChildProperty (Type type, string name)
return pspec;
}
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_ref (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_unref (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_sink (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_name (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_nick (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_blurb (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention=CallingConvention.Cdecl)]
static extern bool g_param_value_defaults (IntPtr obj, ref GLib.Value value);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_ref (IntPtr gtype);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_object_class_find_property (IntPtr klass, string name);
[DllImport("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
Modified: main/src/addins/MonoDevelop.GtkCore/libsteticui/Metacity/Preview.cs
===================================================================
@@ -10,6 +10,7 @@ namespace Stetic.Metacity {
internal class Preview : Gtk.Bin
{
+ const string LIBMETACITY = "libmetacity-private.so.0";
static Theme theme;
public static bool ThemeError = false;
@@ -123,7 +124,7 @@ static Theme GetTheme ()
protected Preview(GLib.GType gtype) : base(gtype) {}
public Preview(IntPtr raw) : base(raw) {}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_new();
public Preview () : base (IntPtr.Zero)
@@ -135,7 +136,7 @@ public Preview () : base (IntPtr.Zero)
Raw = meta_preview_new();
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_title(IntPtr raw, IntPtr title);
public string Title {
@@ -146,7 +147,7 @@ public Preview () : base (IntPtr.Zero)
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_button_layout(IntPtr raw, ref Stetic.Metacity.ButtonLayout button_layout);
public Stetic.Metacity.ButtonLayout ButtonLayout
@@ -156,7 +157,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_theme(IntPtr raw, IntPtr theme);
public Metacity.Theme Theme {
@@ -165,7 +166,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_mini_icon();
public static Gdk.Pixbuf MiniIcon {
@@ -176,7 +177,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_icon();
public static Gdk.Pixbuf Icon {
@@ -187,7 +188,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_frame_type(IntPtr raw, int type);
public Stetic.Metacity.FrameType FrameType
@@ -197,7 +198,7 @@ public Stetic.Metacity.FrameType FrameType
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_type();
public static new GLib.GType GType {
@@ -208,7 +209,7 @@ public Stetic.Metacity.FrameType FrameType
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_frame_flags(IntPtr raw, int flags);
public Stetic.Metacity.FrameFlags FrameFlags
Modified: main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
===================================================================
@@ -7,6 +7,11 @@ namespace Stetic.Windows
{
class WindowsTheme
{
+ const string USER32 = "user32.dll";
+ const string GDI32 = "gdi32.dll";
+ const string LIBGDK = "libgdk-win32-2.0-0.dll";
+ const string UXTHEME = "uxtheme";
+ const string LIBUXTHEME = "uxtheme.dll";
IntPtr hWnd;
IntPtr hTheme;
@@ -83,56 +88,56 @@ public Gdk.Rectangle GetWindowClientArea (Gdk.Rectangle allocation)
const int DT_SINGLELINE = 0x20;
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 DrawThemeBackground (IntPtr hTheme, IntPtr hdc, int iPartId,
int iStateId, ref RECT pRect, ref RECT pClipRect);
- [DllImport ("uxtheme.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (LIBUXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
static extern IntPtr OpenThemeData (IntPtr hWnd, String classList);
- [DllImport ("uxtheme.dll", ExactSpelling = true)]
+ [DllImport (LIBUXTHEME, ExactSpelling = true)]
extern static Int32 CloseThemeData (IntPtr hTheme);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemePartSize (IntPtr hTheme, IntPtr hdc, int part, int state, ref RECT pRect, int eSize, out SIZE size);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemeBackgroundExtent (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pBoundingRect, out RECT pContentRect);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemeMargins (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, int iPropId, out MARGINS pMargins);
- [DllImport ("uxtheme", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
extern static Int32 DrawThemeText (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, String text, int textLength, UInt32 textFlags, UInt32 textFlags2, ref RECT pRect);
- [DllImport ("uxtheme", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
extern static Int32 GetThemeSysFont (IntPtr hTheme, int iFontId, ref LOGFONT plf);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern IntPtr CreateFontIndirect ([In] ref LOGFONT lplf);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern int SetBkMode (IntPtr hdc, int iBkMode);
- [DllImport ("gdi32.dll", ExactSpelling = true, PreserveSig = true, SetLastError = true)]
+ [DllImport (GDI32, ExactSpelling = true, PreserveSig = true, SetLastError = true)]
static extern IntPtr SelectObject (IntPtr hdc, IntPtr hgdiobj);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern bool DeleteObject (IntPtr hObject);
- [DllImport ("user32.dll")]
+ [DllImport (USER32)]
static extern IntPtr GetDC (IntPtr hWnd);
- [DllImport ("user32.dll")]
+ [DllImport (USER32)]
static extern int ReleaseDC (IntPtr hWnd, IntPtr hDC);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr raw);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_hdc_get (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_win32_hdc_release (IntPtr drawable, IntPtr gc, int usage);
}
Modified: main/src/addins/WindowsPlatform/GdkWin32.cs
===================================================================
@@ -32,27 +32,29 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
using Microsoft.WindowsAPICodePack.Dialogs;
-using MonoDevelop.Core;
+using MonoDevelop.Core;
+using CustomControls.OS;
namespace MonoDevelop.Platform
{
public static class GdkWin32
{
static readonly uint GotGdkEventsMessage = RegisterWindowMessage ("GDK_WIN32_GOT_EVENTS");
+ internal const string LIBGDK = "libgdk-win32-2.0-0.dll";
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr drawable);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_hdc_get (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_win32_hdc_release (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_set_modal_dialog_libgtk_only (IntPtr window);
- [DllImport ("User32.dll", SetLastError=true, CharSet=CharSet.Auto)]
+ [DllImport (Win32.USER32, SetLastError=true, CharSet=CharSet.Auto)]
static extern uint RegisterWindowMessage (string lpString);
public static IntPtr HgdiobjGet (Gdk.Drawable drawable)
@@ -191,7 +193,7 @@ static void ClearGtkDialogHook (IntPtr hdlg)
static readonly WindowProc GtkWindowProcDelegate = GtkWindowProc;
static readonly int DWLP_DLGPROC = IntPtr.Size; // DWLP_MSGRESULT + sizeof(LRESULT);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
static extern IntPtr CallWindowProc (IntPtr lpPrevWndFunc, IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
static IntPtr SetWindowLongPtr (IntPtr hWnd, int nIndex, IntPtr dwNewLong)
@@ -201,10 +203,10 @@ static IntPtr SetWindowLongPtr (IntPtr hWnd, int nIndex, IntPtr dwNewLong)
return SetWindowLongPtr64 (hWnd, nIndex, dwNewLong);
}
- [DllImport ("user32.dll", EntryPoint="SetWindowLongPtr")]
+ [DllImport (Win32.USER32, EntryPoint="SetWindowLongPtr")]
static extern IntPtr SetWindowLongPtr64 (IntPtr hWnd, int nIndex, IntPtr dwNewLong);
- [DllImport("user32.dll", EntryPoint="SetWindowLong")]
+ [DllImport(Win32.USER32, EntryPoint="SetWindowLong")]
static extern IntPtr SetWindowLongPtr32 (IntPtr hWnd, int nIndex, IntPtr dwNewLong);
static IntPtr GetWindowLongPtr (IntPtr hWnd, int nIndex)
@@ -214,10 +216,10 @@ static IntPtr GetWindowLongPtr (IntPtr hWnd, int nIndex)
return GetWindowLongPtr64 (hWnd, nIndex);
}
- [DllImport ("user32.dll", EntryPoint="GetWindowLongPtr")]
+ [DllImport (Win32.USER32, EntryPoint="GetWindowLongPtr")]
static extern IntPtr GetWindowLongPtr64 (IntPtr hWnd, int nIndex);
- [DllImport("user32.dll", EntryPoint="GetWindowLong")]
+ [DllImport(Win32.USER32, EntryPoint="GetWindowLong")]
static extern IntPtr GetWindowLongPtr32 (IntPtr hWnd, int nIndex);
delegate IntPtr WindowProc (IntPtr hdlg, uint uiMsg, IntPtr wParam, IntPtr lParam);
Modified: main/src/addins/WindowsPlatform/RecentFiles.cs
===================================================================
@@ -29,6 +29,7 @@
using MonoDevelop.Core;
using MonoDevelop.Ide.Desktop;
using System.Collections.Generic;
+using CustomControls.OS;
namespace MonoDevelop.Platform
{
@@ -52,10 +53,10 @@ public override void AddProject (string fileName, string displayName)
base.AddProject (fileName, displayName);
}
- [DllImport ("Shell32.dll", CharSet = CharSet.Unicode)]
+ [DllImport (Win32.SHELL32, CharSet = CharSet.Unicode)]
static extern void SHAddToRecentDocs (SHARD uFlags, string pv);
- [DllImport ("Shell32.dll", CharSet = CharSet.Unicode)]
+ [DllImport (Win32.SHELL32, CharSet = CharSet.Unicode)]
static extern void SHAddToRecentDocs (SHARD uFlags, IntPtr pv);
enum SHARD : uint
Modified: main/src/addins/WindowsPlatform/Win32.cs
===================================================================
@@ -34,65 +34,67 @@ public static class Win32
public const uint SHGFI_TYPENAME = 0x400;
public const uint SHGFI_USEFILEATTRIBUTES = 0x10;
public const uint FILE_ATTRIBUTES_NORMAL = 0x80;
+ internal const string USER32 = "user32.dll";
+ internal const string SHELL32 = "shell32.dll";
#region Delegates
public delegate bool EnumWindowsCallBack(IntPtr hWnd, int lParam);
#endregion
#region USER32
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr GetParent(IntPtr hWnd);
- [DllImport("User32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern int GetDlgCtrlID(IntPtr hWndCtl);
- [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto, ExactSpelling = true)]
public static extern int MapWindowPoints(IntPtr hWnd, IntPtr hWndTo, ref POINT pt, int cPoints);
- [DllImport("user32.dll", SetLastError = true)]
+ [DllImport(Win32.USER32, SetLastError = true)]
public static extern bool GetWindowInfo(IntPtr hwnd, out WINDOWINFO pwi);
- [DllImport("User32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern void GetWindowText(IntPtr hWnd, StringBuilder param, int length);
- [DllImport("User32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern void GetClassName(IntPtr hWnd, StringBuilder param, int length);
- [DllImport("user32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern bool EnumChildWindows(IntPtr hWndParent, EnumWindowsCallBack lpEnumFunc, int lParam);
- [DllImport("user32.Dll")]
+ [DllImport(Win32.USER32)]
public static extern bool EnumWindows(EnumWindowsCallBack lpEnumFunc, int lParam);
- [DllImport("User32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern bool ReleaseCapture();
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr SetCapture(IntPtr hWnd);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr ChildWindowFromPointEx(IntPtr hParent, POINT pt, ChildFromPointFlags flags);
- [DllImport("user32.dll", EntryPoint = "FindWindowExA", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
+ [DllImport(Win32.USER32, EntryPoint = "FindWindowExA", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int PostMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int PostMessage(IntPtr hWnd, int msg, int wParam, int lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, int lParam);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, StringBuilder param);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, char[] chars);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr BeginDeferWindowPos(int nNumWindows);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern IntPtr DeferWindowPos(IntPtr hWinPosInfo, IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int Width, int Height, SetWindowPosFlags flags);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern bool EndDeferWindowPos(IntPtr hWinPosInfo);
- [DllImport("user32.dll", CharSet = CharSet.Auto)]
+ [DllImport(Win32.USER32, CharSet = CharSet.Auto)]
public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int Width, int Height, SetWindowPosFlags flags);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern bool GetWindowRect(IntPtr hwnd, ref RECT rect);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern bool GetClientRect(IntPtr hwnd, ref RECT rect);
- [DllImport("user32.dll")]
+ [DllImport(Win32.USER32)]
public static extern bool DestroyIcon([In] IntPtr hIcon);
- [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+ [DllImport(Win32.SHELL32, CharSet = CharSet.Unicode)]
public static extern IntPtr SHGetFileInfoW([In] string pszPath, uint dwFileAttributes, [In, Out] ref SHFILEINFO psfi, uint cbSizeFileInfo, uint uFlags);
#endregion
}
Modified: main/src/addins/WindowsPlatform/WindowsPlatform.cs
===================================================================
@@ -163,10 +163,10 @@ unsafe struct MonitorInfo {
[UnmanagedFunctionPointer (CallingConvention.Winapi)]
delegate int EnumMonitorsCallback (IntPtr hmonitor, IntPtr hdc, IntPtr prect, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (Win32.USER32)]
extern static int EnumDisplayMonitors (IntPtr hdc, IntPtr clip, EnumMonitorsCallback callback, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (Win32.USER32)]
extern static int GetMonitorInfoA (IntPtr hmonitor, ref MonitorInfo info);
public override Gdk.Rectangle GetUsableMonitorGeometry (Gdk.Screen screen, int monitor_id)
Modified: main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs
===================================================================
@@ -148,27 +148,30 @@ public override DialogResult ShowMagicDialog ()
static class Native
{
- [DllImport ("ole32.dll")]
+ const string OLE32 = "ole32.dll";
+ const string CREDUI = "credui.dll";
+
+ [DllImport (OLE32)]
internal static extern void CoTaskMemFree (IntPtr ptr);
- [DllImport ("credui.dll")]
+ [DllImport (CREDUI)]
internal static extern CredUiReturnCodes CredUIPromptForCredentials (ref CredentialUiInfo uiInfo, string targetName,
IntPtr reserved1, int iError, StringBuilder userName, int maxUserName, StringBuilder password, int maxPassword,
[MarshalAs (UnmanagedType.Bool)] ref bool pfSave, CredentialsUiFlags windowsFlags);
- [DllImport ("credui.dll", CharSet = CharSet.Unicode)]
+ [DllImport (CREDUI, CharSet = CharSet.Unicode)]
internal static extern WindowsCredentialPromptReturnCode CredUIPromptForWindowsCredentials (ref CredentialUiInfo uiInfo,
int authError, ref int authPackage, IntPtr inAuthBuffer, uint inAuthBufferSize,
out IntPtr refOutAuthBuffer, out int refOutAuthBufferSize, ref bool fSave,
CredentialsUiWindowsFlags uiWindowsFlags);
- [DllImport ("credui.dll", CharSet = CharSet.Auto)]
+ [DllImport (CREDUI, CharSet = CharSet.Auto)]
internal static extern bool CredUnPackAuthenticationBuffer (int dwFlags, IntPtr pAuthBuffer,
int cbAuthBuffer, StringBuilder pszUserName, ref int pcchMaxUserName,
StringBuilder pszDomainName, ref int pcchMaxDomainame, StringBuilder pszPassword,
ref int pcchMaxPassword);
- [DllImport ("credui.dll", CharSet = CharSet.Auto)]
+ [DllImport (CREDUI, CharSet = CharSet.Auto)]
internal static extern bool CredPackAuthenticationBuffer (int dwFlags, string pszUserName, string pszPassword,
IntPtr packedCredentials, ref uint packedCredentialsLength);
Modified: main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs
===================================================================
@@ -252,14 +252,16 @@ override protected bool ReleaseHandle ()
static class NativeMethods
{
- [DllImport ("advapi32.dll", CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredWriteW")]
+ const string ADVAPI32 = "advapi32.dll";
+
+ [DllImport (ADVAPI32, CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredWriteW")]
internal static extern bool CredWrite ([In] ref NativeCredential credential, [In] uint flags);
- [DllImport ("advapi32.dll", CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredReadW")]
+ [DllImport (ADVAPI32, CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "CredReadW")]
internal static extern bool CredRead (string targetName, NativeCredentialType type, CredentialFlags flags,
out IntPtr credential);
- [DllImport ("advapi32.dll", CharSet = CharSet.Unicode, EntryPoint = "CredFree")]
+ [DllImport (ADVAPI32, CharSet = CharSet.Unicode, EntryPoint = "CredFree")]
internal static extern bool CredFree ([In] IntPtr cred);
}
}
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
===================================================================
@@ -37,6 +37,7 @@ namespace Mono.TextEditor
public static class GtkWorkarounds
{
const string LIBOBJC ="/usr/lib/libobjc.dylib";
+ const string USER32DLL = "User32.dll";
[DllImport (LIBOBJC, EntryPoint = "sel_registerName")]
static extern IntPtr sel_registerName (string selector);
@@ -71,7 +72,7 @@ public static class GtkWorkarounds
[DllImport (LIBOBJC, EntryPoint = "objc_msgSend_stret")]
static extern void objc_msgSend_CGRect64 (out CGRect64 rect, IntPtr klass, IntPtr selector);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nswindow (IntPtr window);
struct CGRect32
@@ -259,10 +260,10 @@ unsafe struct MonitorInfo {
[UnmanagedFunctionPointer (CallingConvention.Winapi)]
delegate int EnumMonitorsCallback (IntPtr hmonitor, IntPtr hdc, IntPtr prect, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (USER32DLL)]
extern static int EnumDisplayMonitors (IntPtr hdc, IntPtr clip, EnumMonitorsCallback callback, IntPtr user_data);
- [DllImport ("User32.dll")]
+ [DllImport (USER32DLL)]
extern static int GetMonitorInfoA (IntPtr hmonitor, ref MonitorInfo info);
static Gdk.Rectangle WindowsGetUsableMonitorGeometry (Gdk.Screen screen, int monitor_id)
@@ -735,7 +736,7 @@ public static void MapRawKeys (Gdk.EventKey evt, out Gdk.Key key, out Gdk.Modifi
mod = accels[0].Modifier;
}
- [System.Runtime.InteropServices.DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [System.Runtime.InteropServices.DllImport (PangoUtil.LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr drawable);
enum DwmWindowAttribute
@@ -774,7 +775,7 @@ public Win32Rect (int left, int top, int right, int bottom)
[DllImport ("dwmapi.dll")]
static extern int DwmIsCompositionEnabled (out bool enabled);
- [DllImport ("User32.dll")]
+ [DllImport (USER32DLL)]
static extern bool GetWindowRect (IntPtr hwnd, out Win32Rect rect);
public static void SetImCursorLocation (Gtk.IMContext ctx, Gdk.Window clientWindow, Gdk.Rectangle cursor)
@@ -832,7 +833,7 @@ public static void UpdateNativeShadow (Gtk.Window window)
objc_msgSend_IntPtr (ptr, sel_invalidateShadow);
}
- [DllImport ("gtksharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (PangoUtil.LIBGTKGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern void gtksharp_container_leak_fixed_marker ();
static HashSet<Type> fixedContainerTypes;
@@ -984,7 +985,7 @@ static ForallDelegate CreateForallCallback (IntPtr gtype)
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
- [DllImport("gtksharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBGTKGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
public static string MarkupLinks (string text)
@@ -1037,10 +1038,10 @@ class ActivateLinkEventArgs : GLib.SignalArgs
static bool canSetOverlayScrollbarPolicy = true;
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_scrolled_window_set_overlay_policy (IntPtr sw, Gtk.PolicyType hpolicy, Gtk.PolicyType vpolicy);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_scrolled_window_get_overlay_policy (IntPtr sw, out Gtk.PolicyType hpolicy, out Gtk.PolicyType vpolicy);
public static void SetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, Gtk.PolicyType hpolicy, Gtk.PolicyType vpolicy)
@@ -1072,7 +1073,7 @@ public static void GetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, out Gtk.Pol
canSetOverlayScrollbarPolicy = false;
}
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (PangoUtil.LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_view_get_tooltip_context (IntPtr raw, ref int x, ref int y, bool keyboard_tip, out IntPtr model, out IntPtr path, IntPtr iter);
//the GTK# version of this has 'out' instead of 'ref', preventing passing the x,y values in
@@ -1092,10 +1093,10 @@ public static void GetOverlayScrollbarPolicy (Gtk.ScrolledWindow sw, out Gtk.Pol
static bool supportsHiResIcons = false; // Disabled for now
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_icon_source_set_scale (IntPtr source, double scale);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (PangoUtil.LIBQUARTZ)]
static extern void gtk_icon_source_set_scale_wildcarded (IntPtr source, bool setting);
[DllImport (PangoUtil.LIBGTK)]
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/PangoUtil.cs
===================================================================
@@ -39,6 +39,8 @@ public static class PangoUtil
internal const string LIBGOBJECT = "libgobject-2.0-0.dll";
internal const string LIBPANGO = "libpango-1.0-0.dll";
internal const string LIBPANGOCAIRO = "libpangocairo-1.0-0.dll";
+ internal const string LIBQUARTZ = "libgtk-quartz-2.0.dylib";
+ internal const string LIBGTKGLUE = "gtksharpglue-2";
/// <summary>
/// This doesn't leak Pango layouts, unlike some other ways to create them in GTK# <= 2.12.11
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
===================================================================
@@ -69,7 +69,7 @@ public static IEnumerable<TextSegment> AdjustSegments (this IEnumerable<TextSegm
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
public static void ShowLayout (this Cairo.Context cr, Pango.Layout layout)
@@ -77,7 +77,7 @@ public static void ShowLayout (this Cairo.Context cr, Pango.Layout layout)
pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_cairo_create_layout (IntPtr cr);
public static Pango.Layout CreateLayout (this Cairo.Context cr)
@@ -86,7 +86,7 @@ public static Pango.Layout CreateLayout (this Cairo.Context cr)
return GLib.Object.GetObject (raw_ret) as Pango.Layout;
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
@@ -94,7 +94,7 @@ public static void LayoutPath (this Cairo.Context cr, Pango.Layout layout)
pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
public static void ContextSetResolution (this Pango.Context context, double dpi)
@@ -102,7 +102,7 @@ public static void ContextSetResolution (this Pango.Context context, double dpi)
pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(PangoUtil.LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
static extern IntPtr pango_layout_get_context (IntPtr layout);
public static string GetColorString (Gdk.Color color)
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessExtensions.cs
===================================================================
@@ -88,7 +88,7 @@ static IEnumerable<int> GetAllChildren (Dictionary<int,List<int>> procRelations,
return procRelations;
}
- static uint TH32CS_SNAPPROCESS = 2;
+ const uint TH32CS_SNAPPROCESS = 2;
[StructLayout(LayoutKind.Sequential)]
public struct PROCESSENTRY32
@@ -106,13 +106,14 @@ public struct PROCESSENTRY32
public string szExeFile;
};
- [DllImport("kernel32.dll", SetLastError = true)]
+ const string kernel = "kernel32.dll";
+ [DllImport(kernel, SetLastError = true)]
static extern IntPtr CreateToolhelp32Snapshot (uint dwFlags, uint th32ProcessID);
- [DllImport("kernel32.dll")]
+ [DllImport(kernel)]
static extern bool Process32First (IntPtr hSnapshot, ref PROCESSENTRY32 lppe);
- [DllImport("kernel32.dll")]
+ [DllImport(kernel)]
static extern bool Process32Next (IntPtr hSnapshot, ref PROCESSENTRY32 lppe);
}
}
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
===================================================================
@@ -40,7 +40,9 @@
namespace MonoDevelop.Projects.Text
{
public class TextFile: IEditableTextFile
- {
+ {
+ const string LIBGLIB = "libglib-2.0-0.dll";
+
FilePath name;
StringBuilder text;
string sourceEncoding;
@@ -235,16 +237,16 @@ static byte[] ConvertToBytes (byte[] content, long nread, string toEncoding, str
throw ex;
}
}
-
- [DllImport("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+
+ [DllImport(LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
//note: textLength is signed, read/written are not
static extern IntPtr g_convert(byte[] text, IntPtr textLength, string toCodeset, string fromCodeset,
ref IntPtr read, ref IntPtr written, ref IntPtr err);
- [DllImport("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_free (IntPtr ptr);
- [DllImport("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_error_free (IntPtr err);
#endregion
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
===================================================================
@@ -50,6 +50,7 @@ public enum CairoCorners
public static class CairoExtensions
{
+ internal const string LIBCAIRO = "libcairo-2.dll";
public static Cairo.Rectangle ToCairoRect (this Gdk.Rectangle rect)
{
return new Cairo.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
@@ -421,10 +422,10 @@ public static void RenderOuterShadow (this Cairo.Context self, Gdk.Rectangle are
}
}
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_pattern_set_extend(IntPtr pattern, CairoExtend extend);
- [DllImport ("libcairo-2.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention=CallingConvention.Cdecl)]
internal static extern IntPtr cairo_get_source (IntPtr cr);
enum CairoExtend {
@@ -488,7 +489,7 @@ private static bool CallCairoMethod (Cairo.Context cr, ref CairoInteropCall call
private static bool native_push_pop_exists = true;
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
private static extern void cairo_push_group (IntPtr ptr);
private static CairoInteropCall cairo_push_group_call = new CairoInteropCall ("PushGroup");
@@ -507,7 +508,7 @@ public static void PushGroup (Cairo.Context cr)
}
}
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
private static extern void cairo_pop_group_to_source (IntPtr ptr);
private static CairoInteropCall cairo_pop_group_to_source_call = new CairoInteropCall ("PopGroupToSource");
@@ -666,13 +667,13 @@ public class QuartzSurface : Cairo.Surface
{
const string CoreGraphics = "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/CoreGraphics";
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (CairoExtensions.LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_quartz_surface_create (Cairo.Format format, uint width, uint height);
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (CairoExtensions.LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_quartz_surface_get_cg_context (IntPtr surface);
- [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (CairoExtensions.LIBCAIRO, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr cairo_get_target (IntPtr context);
[DllImport (CoreGraphics, EntryPoint="CGContextConvertRectToDeviceSpace", CallingConvention = CallingConvention.Cdecl)]
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoCairoHelper.cs
===================================================================
@@ -33,7 +33,8 @@ namespace MonoDevelop.Components
{
public static class PangoCairoHelper
{
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ const string LIBPANGOCAIRO = "libpangocairo-1.0-0.dll";
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern void pango_cairo_show_layout (IntPtr cr, IntPtr layout);
public static void ShowLayout (Cairo.Context cr, Pango.Layout layout)
@@ -41,7 +42,7 @@ public static void ShowLayout (Cairo.Context cr, Pango.Layout layout)
pango_cairo_show_layout (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern IntPtr pango_cairo_create_layout (IntPtr cr);
public static Pango.Layout CreateLayout (Cairo.Context cr)
@@ -50,7 +51,7 @@ public static Pango.Layout CreateLayout (Cairo.Context cr)
return GLib.Object.GetObject (raw_ret) as Pango.Layout;
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern void pango_cairo_layout_path (IntPtr cr, IntPtr layout);
public static void LayoutPath (Cairo.Context cr, Pango.Layout layout, bool iUnderstandThePerformanceImplications)
@@ -58,7 +59,7 @@ public static void LayoutPath (Cairo.Context cr, Pango.Layout layout, bool iUnde
pango_cairo_layout_path (cr == null ? IntPtr.Zero : cr.Handle, layout == null ? IntPtr.Zero : layout.Handle);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern void pango_cairo_context_set_resolution (IntPtr pango_context, double dpi);
public static void ContextSetResolution (Pango.Context context, double dpi)
@@ -66,7 +67,7 @@ public static void ContextSetResolution (Pango.Context context, double dpi)
pango_cairo_context_set_resolution (context == null ? IntPtr.Zero : context.Handle, dpi);
}
- [DllImport("libpangocairo-1.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBPANGOCAIRO, CallingConvention=CallingConvention.Cdecl)]
private static extern IntPtr pango_layout_get_context (IntPtr layout);
public static string GetColorString (Gdk.Color color)
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/GLibLogging.cs
===================================================================
@@ -72,7 +72,7 @@ public enum LogLevelFlags : int
public class Log
{
-
+ const string LIBGLIB = "libglib-2.0-0.dll";
static Hashtable handlers;
static void EnsureHash ()
@@ -81,7 +81,7 @@ static void EnsureHash ()
handlers = new Hashtable ();
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_logv (IntPtr log_domain, LogLevelFlags flags, IntPtr message);
public void WriteLog (string logDomain, LogLevelFlags flags, string format, params object[] args)
@@ -93,7 +93,7 @@ public void WriteLog (string logDomain, LogLevelFlags flags, string format, para
GLib.Marshaller.Free (nmessage);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern uint g_log_set_handler (IntPtr log_domain, LogLevelFlags flags, LogFunc2 log_func, LogFunc user_data);
static readonly LogFunc2 LogFuncTrampoline = (string domain, LogLevelFlags level, string message, LogFunc user_data) => {
@@ -111,7 +111,7 @@ public static uint SetLogHandler (string logDomain, LogLevelFlags flags, LogFunc
return result;
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern uint g_log_remove_handler (IntPtr log_domain, uint handler_id);
public static void RemoveLogHandler (string logDomain, uint handlerID)
@@ -125,7 +125,7 @@ public static void RemoveLogHandler (string logDomain, uint handlerID)
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern PrintFunc g_set_print_handler (PrintFunc handler);
public static PrintFunc SetPrintHandler (PrintFunc handler)
@@ -136,7 +136,7 @@ public static PrintFunc SetPrintHandler (PrintFunc handler)
return g_set_print_handler (handler);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern PrintFunc g_set_printerr_handler (PrintFunc handler);
public static PrintFunc SetPrintErrorHandler (PrintFunc handler)
@@ -147,7 +147,7 @@ public static PrintFunc SetPrintErrorHandler (PrintFunc handler)
return g_set_printerr_handler (handler);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
static extern void g_log_default_handler (IntPtr log_domain, LogLevelFlags log_level, IntPtr message, IntPtr unused_data);
public static void DefaultHandler (string logDomain, LogLevelFlags logLevel, string message)
@@ -159,7 +159,7 @@ public static void DefaultHandler (string logDomain, LogLevelFlags logLevel, str
GLib.Marshaller.Free (nmess);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
extern static LogLevelFlags g_log_set_always_fatal (LogLevelFlags fatal_mask);
public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask)
@@ -167,7 +167,7 @@ public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask)
return g_log_set_always_fatal (fatalMask);
}
- [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIB, CallingConvention = CallingConvention.Cdecl)]
extern static LogLevelFlags g_log_set_fatal_mask (IntPtr log_domain, LogLevelFlags fatal_mask);
public static LogLevelFlags SetAlwaysFatal (string logDomain, LogLevelFlags fatalMask)
Modified: main/src/tools/mdmonitor/MacIntegration/MacIntegration.cs
===================================================================
@@ -31,9 +31,11 @@
namespace MacIntegration
{
- public class IgeMacMenu
+ public static class IgeMacMenu
{
- [DllImport("libigemacintegration.dylib")]
+ internal const string maclib = "libigemacintegration.dylib";
+
+ [DllImport(maclib)]
static extern void ige_mac_menu_connect_window_key_handler (IntPtr window);
public static void ConnectWindowKeyHandler (Gtk.Window window)
@@ -41,7 +43,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
ige_mac_menu_connect_window_key_handler (window.Handle);
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern void ige_mac_menu_set_global_key_handler_enabled (bool enabled);
public static bool GlobalKeyHandlerEnabled {
@@ -50,7 +52,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
}
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern void ige_mac_menu_set_menu_bar (IntPtr menu_shell);
public static Gtk.MenuShell MenuBar {
@@ -59,7 +61,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
}
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern void ige_mac_menu_set_quit_menu_item (IntPtr quit_item);
public static Gtk.MenuItem QuitMenuItem {
@@ -68,7 +70,7 @@ public static void ConnectWindowKeyHandler (Gtk.Window window)
}
}
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(maclib)]
static extern IntPtr ige_mac_menu_add_app_menu_group ();
public static IgeMacMenuGroup AddAppMenuGroup ()
@@ -81,7 +83,7 @@ public static IgeMacMenuGroup AddAppMenuGroup ()
public class IgeMacMenuGroup : GLib.Opaque
{
- [DllImport("libigemacintegration.dylib")]
+ [DllImport(IgeMacMenu.maclib)]
static extern void ige_mac_menu_add_app_menu_item (IntPtr raw, IntPtr menu_item, IntPtr label);
public void AddMenuItem (Gtk.MenuItem menu_item, string label)
Commit: a3e7bb7dc14c13db3dc94e6d477a4df057419bef
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-12 15:31:44 GMT
URL: https://github.com/mono/monodevelop/commit/a3e7bb7dc14c13db3dc94e6d477a4df057419bef
Fixed 'Bug 16126 - When searching in the whole solution, if there are
many search matches (e.g. over 500-1000) an error is displayed'.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
===================================================================
@@ -278,16 +278,55 @@ void HandleTextReplaced (object sender, DocumentChangeEventArgs e)
ColorScheme colorStyle;
public ColorScheme ColorStyle {
get {
- return colorStyle ?? Mono.TextEditor.Highlighting.SyntaxModeService.DefaultColorStyle;
+ return colorStyle ?? SyntaxModeService.DefaultColorStyle;
}
set {
colorStyle = value;
}
}
+
+ string ConvertToPangoMarkup (string str, bool replaceTabs = true)
+ {
+ if (str == null)
+ throw new ArgumentNullException ("str");
+ var result = new StringBuilder ();
+ foreach (char ch in str) {
+ switch (ch) {
+ case '&':
+ result.Append ("&");
+ break;
+ case '<':
+ result.Append ("<");
+ break;
+ case '>':
+ result.Append (">");
+ break;
+ case '\t':
+ if (replaceTabs) {
+ result.Append (new string (' ', options.TabSize));
+ } else {
+ result.Append ('\t');
+ }
+ break;
+ default:
+ result.Append (ch);
+ break;
+ }
+ }
+ return result.ToString ();
+ }
public string GetMarkup (int offset, int length, bool removeIndent, bool useColors = true, bool replaceTabs = true)
{
ISyntaxMode mode = Document.SyntaxMode;
+ var style = ColorStyle;
+
+ if (style == null) {
+ var str = Document.GetTextAt (offset, length);
+ if (removeIndent)
+ str = str.TrimStart (' ', '\t');
+ return ConvertToPangoMarkup (str, replaceTabs);
+ }
int indentLength = SyntaxMode.GetIndentLength (Document, offset, length, false);
int curOffset = offset;
@@ -298,8 +337,8 @@ public string GetMarkup (int offset, int length, bool removeIndent, bool useColo
int toOffset = System.Math.Min (line.Offset + line.Length, offset + length);
var styleStack = new Stack<ChunkStyle> ();
- foreach (var chunk in mode.GetChunks (ColorStyle, line, curOffset, toOffset - curOffset)) {
- var chunkStyle = ColorStyle.GetChunkStyle (chunk);
+ foreach (var chunk in mode.GetChunks (style, line, curOffset, toOffset - curOffset)) {
+ var chunkStyle = style.GetChunkStyle (chunk);
bool setBold = (styleStack.Count > 0 && styleStack.Peek ().FontWeight != chunkStyle.FontWeight) ||
chunkStyle.FontWeight != FontWeight.Normal;
bool setItalic = (styleStack.Count > 0 && styleStack.Peek ().FontStyle != chunkStyle.FontStyle) ||
@@ -327,31 +366,7 @@ public string GetMarkup (int offset, int length, bool removeIndent, bool useColo
result.Append (">");
styleStack.Push (chunkStyle);
}
-
- for (int i = 0; i < chunk.Length && chunk.Offset + i < Document.TextLength; i++) {
- char ch = Document.GetCharAt (chunk.Offset + i);
- switch (ch) {
- case '&':
- result.Append ("&");
- break;
- case '<':
- result.Append ("<");
- break;
- case '>':
- result.Append (">");
- break;
- case '\t':
- if (replaceTabs) {
- result.Append (new string (' ', options.TabSize));
- } else {
- result.Append ('\t');
- }
- break;
- default:
- result.Append (ch);
- break;
- }
- }
+ result.Append (ConvertToPangoMarkup (Document.GetTextBetween (chunk.Offset, System.Math.Min (chunk.EndOffset, Document.TextLength)), replaceTabs));
}
while (styleStack.Count > 0) {
result.Append ("</span>");
@@ -552,13 +567,13 @@ public bool CanEdit (int line)
return !document.ReadOnly;
}
- public int FindNextWordOffset (int offset)
+ public int FindNextWordOffset (int offset)
{
return options.WordFindStrategy.FindNextWordOffset (Document, offset);
}
-
- public int FindPrevWordOffset (int offset)
- {
+
+ public int FindPrevWordOffset (int offset)
+ {
return options.WordFindStrategy.FindPrevWordOffset (Document, offset);
}
@@ -809,15 +824,15 @@ protected virtual void OnSelectionChanging (EventArgs e)
public IEnumerable<DocumentLine> SelectedLines {
get {
if (!IsSomethingSelected)
- return document.GetLinesBetween (caret.Line, caret.Line);
- var selection = MainSelection;
+ return document.GetLinesBetween (caret.Line, caret.Line);
+ var selection = MainSelection;
int startLineNr = selection.MinLine;
int endLineNr = selection.MaxLine;
bool skipEndLine = selection.Anchor < selection.Lead ? selection.Lead.Column == DocumentLocation.MinColumn : selection.Anchor.Column == DocumentLocation.MinColumn;
- if (skipEndLine)
- endLineNr--;
- return document.GetLinesBetween (startLineNr, endLineNr);
+ if (skipEndLine)
+ endLineNr--;
+ return document.GetLinesBetween (startLineNr, endLineNr);
}
}
@@ -981,9 +996,9 @@ protected virtual void OnSearchChanged (EventArgs args)
OnSearchChanged (EventArgs.Empty);
};
}
- return currentSearchRequest;
- }
- }
+ return currentSearchRequest;
+ }
+ }
public bool IsMatchAt (int offset)
{
Commit: 74d56e5a72c3625285d6caafeb703d01d592c9d0
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-12 18:52:33 GMT
URL: https://github.com/mono/monodevelop/commit/74d56e5a72c3625285d6caafeb703d01d592c9d0
Fixed typo
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
===================================================================
@@ -700,7 +700,7 @@ public void Save (string fileName, Encoding encoding)
}
Mono.TextEditor.Utils.TextFileUtility.WriteText (fileName, writeText, writeEncoding, writeBom);
} catch (InvalidEncodingException) {
- var result = MessageService.AskQuestion (GettextCatalog.GetString ("Can't save file witch current codepage."),
+ var result = MessageService.AskQuestion (GettextCatalog.GetString ("Can't save file with current codepage."),
GettextCatalog.GetString ("Some unicode characters in this file could not be saved with the current encoding.\nDo you want to resave this file as Unicode ?\nYou can choose another encoding in the 'save as' dialog."),
1,
AlertButton.Cancel,
Commit: 361ef4b7553a8a45dd3bd342e879285e26495929
Author: lluis <[email protected]> (slluis)
Date: 2013-11-12 20:23:15 GMT
URL: https://github.com/mono/monodevelop/commit/361ef4b7553a8a45dd3bd342e879285e26495929
Updated references to xwt, debugger-libs
Changed paths:
M main/external/debugger-libs
M main/external/xwt
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit dc63536bdeba18737d922bcf4731d3dd2e7a74a6
+Subproject commit e61a20e1451ff12ee4b0672cc9523ad2c612beb9
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 67a97ff70ffd5b488a4073ae7abad2173054c6c5
+Subproject commit ef54d065c721ce013d2dc96284629441aba1672b
Commit: acc09e8978aab13777cdbd1dffb4311faaf2bdd9
Author: lluis <[email protected]> (slluis)
Date: 2013-11-12 20:25:33 GMT
URL: https://github.com/mono/monodevelop/commit/acc09e8978aab13777cdbd1dffb4311faaf2bdd9
Updated reference to md-addins
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=17c53fa30aaa4a70e43962832592e4ad936630e3
+DEP_NEEDED_VERSION[0]=f1294f6c1bc4d4b81189c7d4312920a89353844c
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: d855a1b2fcad50a39f8b43c714daa44b8da3cff4
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-13 07:14:33 GMT
URL: https://github.com/mono/monodevelop/commit/d855a1b2fcad50a39f8b43c714daa44b8da3cff4
[TextEditor] Fixed 'Bug 16126 - When searching in the whole solution,
if there are many search matches (e.g. over 500-1000) an error is
displayed'.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
===================================================================
@@ -591,7 +591,7 @@ public ChunkStyle GetChunkStyle (string color)
PropertyDecsription val;
if (!textColors.TryGetValue (color, out val)) {
Console.WriteLine ("Chunk style : " + color + " is undefined.");
- return null;
+ return GetChunkStyle ("Plain Text");
}
return val.Info.GetValue (this, null) as ChunkStyle;
}
Commit: d0d98a2ca894b5437a813cb97c0c3dd96beb6936
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-13 08:08:03 GMT
URL: https://github.com/mono/monodevelop/commit/d0d98a2ca894b5437a813cb97c0c3dd96beb6936
Fixed 'Bug 16174 - Editor still inserting unwanted tabs'.
Changed paths:
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
M main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
===================================================================
@@ -56,7 +56,7 @@ class CSharpTextEditorIndentation : TextEditorExtension
}
}
- readonly IEnumerable<string> types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
+ readonly IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
CSharpFormattingPolicy Policy {
get {
@@ -484,15 +484,17 @@ public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modif
lastCharInserted = TranslateKeyCharForIndenter (key, keyChar, textEditorData.GetCharAt (textEditorData.Caret.Offset - 1));
if (lastCharInserted == '\0')
return retval;
-
using (var undo = textEditorData.OpenUndoGroup ()) {
SafeUpdateIndentEngine (textEditorData.Caret.Offset);
if (key == Gdk.Key.Return && modifier == Gdk.ModifierType.ControlMask) {
FixLineStart (textEditorData, stateTracker, textEditorData.Caret.Line + 1);
} else {
- if (!(oldLine == textEditorData.Caret.Line + 1 && lastCharInserted == '\n') && (oldBufLen != textEditorData.Length || lastCharInserted != '\0'))
+ if (!(oldLine == textEditorData.Caret.Line + 1 && lastCharInserted == '\n') && (oldBufLen != textEditorData.Length || lastCharInserted != '\0')) {
DoPostInsertionSmartIndent (lastCharInserted, out reIndent);
+ } else {
+ reIndent = lastCharInserted == '\n';
+ }
}
//reindent the line after the insertion, if needed
//N.B. if the engine says we need to reindent, make sure that it's because a char was
@@ -510,7 +512,7 @@ public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modif
}
}
- if (key != Gdk.Key.Return && (reIndent || automaticReindent)) {
+ if (reIndent || key != Gdk.Key.Return && automaticReindent) {
using (var undo = textEditorData.OpenUndoGroup ()) {
DoReSmartIndent ();
}
@@ -542,6 +544,10 @@ public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modif
//and calls HandleCodeCompletion etc to handles completion
var result = base.KeyPress (key, keyChar, modifier);
+ if (key == Gdk.Key.Return || key == Gdk.Key.KP_Enter) {
+ DoReSmartIndent ();
+ }
+
CheckXmlCommentCloseTag (keyChar);
if (!skipFormatting && keyChar == '}')
Modified: main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs
===================================================================
@@ -234,6 +234,45 @@ void Bar ()
Console.WriteLine (newText);
Assert.AreEqual (expected, newText);
}
+
+ /// <summary>
+ /// Bug 16174 - Editor still inserting unwanted tabs
+ /// </summary>
+ [Test]
+ public void TestBug16174_AutoIndent ()
+ {
+ TestViewContent content;
+
+ var ext = Setup ("namespace Foo\n{\n\tpublic class Bar\n\t{\n$\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n", out content);
+ ext.document.Editor.Options.IndentStyle = IndentStyle.Auto;
+ MiscActions.InsertNewLine (content.Data);
+ ext.KeyPress (Gdk.Key.Return, '\n', Gdk.ModifierType.None);
+
+ var newText = content.Text;
+
+ var expected = "namespace Foo\n{\n\tpublic class Bar\n\t{\n\n\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n";
+ if (newText != expected)
+ Console.WriteLine (newText);
+ Assert.AreEqual (expected, newText);
+ }
+
+ [Test]
+ public void TestBug16174_VirtualIndent ()
+ {
+ TestViewContent content;
+
+ var ext = Setup ("namespace Foo\n{\n\tpublic class Bar\n\t{\n$\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n", out content);
+ ext.document.Editor.Options.IndentStyle = IndentStyle.Virtual;
+ MiscActions.InsertNewLine (content.Data);
+ ext.KeyPress (Gdk.Key.Return, '\n', Gdk.ModifierType.None);
+
+ var newText = content.Text;
+
+ var expected = "namespace Foo\n{\n\tpublic class Bar\n\t{\n\n\t\tvoid Test()\n\t\t{\n\t\t}\n\t}\n}\n";
+ if (newText != expected)
+ Console.WriteLine (newText);
+ Assert.AreEqual (expected, newText);
+ }
}
}
Commit: fd81164a1d381fdc662b29962402d157bd3832f3
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-13 11:32:48 GMT
URL: https://github.com/mono/monodevelop/commit/fd81164a1d381fdc662b29962402d157bd3832f3
Fixed 'Bug 16155 - Automatically disable Source Analysis for projects
excluded from current build configuration'.
Changed paths:
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
===================================================================
@@ -57,7 +57,7 @@ static IEnumerable<BaseCodeIssueProvider> EnumerateProvider (CodeIssueProvider p
public static IEnumerable<Result> Check (Document input, CancellationToken cancellationToken)
{
- if (!QuickTaskStrip.EnableFancyFeatures || input.Project == null)
+ if (!QuickTaskStrip.EnableFancyFeatures || input.Project == null || !input.IsCompileableInProject)
return Enumerable.Empty<Result> ();
#if PROFILE
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
===================================================================
@@ -204,6 +204,14 @@ public Document (IWorkbenchWindow window)
var project = Project;
if (project == null)
return false;
+ var solution = project.ParentSolution;
+
+ if (solution != null && IdeApp.Workspace != null) {
+ var config = IdeApp.Workspace.ActiveConfiguration;
+ if (config != null && !solution.GetConfiguration (config).BuildEnabledForItem (project))
+ return false;
+ }
+
var pf = project.GetProjectFile (FileName);
return pf != null && pf.BuildAction == BuildAction.Compile;
}
@@ -546,7 +554,7 @@ void OnClosed (object s, EventArgs a)
internal void DisposeDocument ()
{
- DetachExtensionChain ();
+ DetachExtensionChain ();
RemoveAnnotations (typeof(System.Object));
if (window is SdiWorkspaceWindow)
((SdiWorkspaceWindow)window).DetachFromPathedDocument ();
Commit: df408a1a0b9272873c04d04e9a809ca7221d7ae3
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-13 12:29:59 GMT
URL: https://github.com/mono/monodevelop/commit/df408a1a0b9272873c04d04e9a809ca7221d7ae3
Fixed 'Bug 16130 - Invalid Redundant assignment'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit ceeee95cc57169a5cba9c7a3503c524393a152f0
+Subproject commit a96c2d076ee31abb607244de57d555c048dec028
Commit: c3b5311aa48f0ac40c914521af666ab48acaa478
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-13 12:41:00 GMT
URL: https://github.com/mono/monodevelop/commit/c3b5311aa48f0ac40c914521af666ab48acaa478
[TextEditor] Guard against potential vi status area infinite loop.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
===================================================================
@@ -69,11 +69,16 @@ protected override void OnDestroyed ()
base.OnDestroyed ();
}
+ Gdk.Rectangle lastAllocation;
public void AllocateArea (TextArea textArea, Gdk.Rectangle allocation)
{
if (!Visible)
Show ();
allocation.Height -= (int)textArea.LineHeight;
+ if (lastAllocation == allocation)
+ return;
+ lastAllocation = allocation;
+
if (textArea.Allocation != allocation)
textArea.SizeAllocate (allocation);
SetSizeRequest (allocation.Width, (int)editor.LineHeight);
Commit: d2a932322a0bffd981d4a6464f96b6efcd08798a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-13 12:59:06 GMT
URL: https://github.com/mono/monodevelop/commit/d2a932322a0bffd981d4a6464f96b6efcd08798a
Fixed 'Bug 15867 - Wrong Context for string formatting'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit a96c2d076ee31abb607244de57d555c048dec028
+Subproject commit 354d61854b97a4ac2e250ff78a4cdd72f9aeb651
Commit: 8ffeb7c720011e8e633fede07b6e7d19f549799a
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-13 17:27:53 GMT
URL: https://github.com/mono/monodevelop/commit/8ffeb7c720011e8e633fede07b6e7d19f549799a
bumped version-checks for md-addins fix
Changed paths:
M version-checks
Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
DEP_NAME[0]=MDADDINS
DEP_PATH[0]=${top_srcdir}/../md-addins
DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=f1294f6c1bc4d4b81189c7d4312920a89353844c
+DEP_NEEDED_VERSION[0]=38e0f1714471739c1c4b51d5b940332bcc3ccad7
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 97bd04ebc3060913d8ffb2d3bae104ee62bb09c8
Author: Eko Wahyudin <[email protected]> (ekowahyudin)
Date: 2013-11-14 04:41:06 GMT
URL: https://github.com/mono/monodevelop/commit/97bd04ebc3060913d8ffb2d3bae104ee62bb09c8
Update GdbSession.cs
fix CheckBreakpoint function.
bp.TraceExpression sometime is empty or null, if that's happen, gdb will report an error System.InvalidOperationException: -data-evaluate-expression: Usage: -data-evaluate-expression expression.
Changed paths:
M extras/MonoDevelop.Debugger.Gdb/GdbSession.cs
Modified: extras/MonoDevelop.Debugger.Gdb/GdbSession.cs
===================================================================
@@ -345,7 +345,7 @@ bool CheckBreakpoint (int handle)
RunCommand ("-break-condition", handle.ToString (), "(" + bp.ConditionExpression + ") != " + val);
}
- if (bp.HitAction == HitAction.PrintExpression) {
+ if (!string.IsNullOrEmpty (bp.TraceExpression) && bp.HitAction == HitAction.PrintExpression) {
GdbCommandResult res = RunCommand ("-data-evaluate-expression", Escape (bp.TraceExpression));
string val = res.GetValue ("value");
NotifyBreakEventUpdate (binfo, 0, val);
Commit: 700f27dbca58ddeacaead1a79111036b4ee6dd12
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-14 05:57:13 GMT
URL: https://github.com/mono/monodevelop/commit/700f27dbca58ddeacaead1a79111036b4ee6dd12
Fixed 'Bug 16192 - Semantic highlighting marks things with red colour
while it is analyzing'.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
===================================================================
@@ -804,7 +804,7 @@ public ParsedDocument UpdateParseDocument ()
get {
if (currentWrapper == null)
return false;
- return currentWrapper.InLoad || !currentWrapper.ReferencesConnected;
+ return !currentWrapper.IsLoaded || !currentWrapper.ReferencesConnected;
}
}
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
===================================================================
@@ -951,6 +951,20 @@ static bool GetReferencesConnected (ProjectContentWrapper pcw, HashSet<ProjectCo
return pcw.referencesConnected && pcw.referencedWrappers.All (w => GetReferencesConnected (w, wrapper));
}
+ public bool IsLoaded {
+ get {
+ return GetIsLoaded (this, new HashSet<ProjectContentWrapper> ());
+ }
+ }
+
+ static bool GetIsLoaded (ProjectContentWrapper pcw, HashSet<ProjectContentWrapper> wrapper)
+ {
+ if (wrapper.Contains (pcw))
+ return true;
+ wrapper.Add (pcw);
+ return !pcw.InLoad && pcw.referencedWrappers.All (w => GetIsLoaded (w, wrapper));
+ }
+
public IProjectContent Content {
get {
if (!referencesConnected) {
@@ -2600,6 +2614,7 @@ static void QueueParseJob (ProjectContentWrapper context, IEnumerable<ProjectFil
};
lock (parseQueueLock) {
RemoveParseJob (context);
+ context.LoadOperationDepth++;
parseQueueIndex [context] = job;
parseQueue.Enqueue (job);
parseEvent.Set ();
@@ -2637,17 +2652,7 @@ static void RemoveParseJob (ProjectContentWrapper project)
ParsingJob job;
if (parseQueueIndex.TryGetValue (project, out job)) {
parseQueueIndex.Remove (project);
- }
- }
- }
-
- static void RemoveParseJobs (IProjectContent context)
- {
- lock (parseQueueLock) {
- foreach (var pj in parseQueue) {
- if (pj.Context == context) {
- parseQueueIndex.Remove (pj.Context);
- }
+ project.LoadOperationDepth--;
}
}
}
@@ -2814,6 +2819,8 @@ static void ConsumeParsingQueue ()
if (monitor == null)
monitor = GetParseProgressMonitor ();
monitor.ReportError (null, ex);
+ } finally {
+ job.Context.LoadOperationDepth--;
}
}
Commit: a9adb8f2693f68981e25246b0a0cd1a615721d4a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-14 06:03:22 GMT
URL: https://github.com/mono/monodevelop/commit/a9adb8f2693f68981e25246b0a0cd1a615721d4a
Fixed 'Bug 16197 - Error bubbles have wrong z-position'.
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
===================================================================
@@ -58,8 +58,8 @@ public MessageBubbleCache (TextEditor editor)
warningPixbuf = ImageService.GetPixbuf ("md-bubble-warning", Gtk.IconSize.Menu);
editor.EditorOptionsChanged += HandleEditorEditorOptionsChanged;
- editor.LeaveNotifyEvent += HandleLeaveNotifyEvent;
- editor.MotionNotifyEvent += HandleMotionNotifyEvent;
+ editor.TextArea.LeaveNotifyEvent += HandleLeaveNotifyEvent;
+ editor.TextArea.MotionNotifyEvent += HandleMotionNotifyEvent;
editor.TextArea.BeginHover += HandleBeginHover;
editor.VAdjustment.ValueChanged += HandleValueChanged;
editor.HAdjustment.ValueChanged += HandleValueChanged;
@@ -289,8 +289,8 @@ public void Dispose ()
editor.VAdjustment.ValueChanged -= HandleValueChanged;
editor.HAdjustment.ValueChanged -= HandleValueChanged;
editor.TextArea.BeginHover -= HandleBeginHover;
- editor.LeaveNotifyEvent -= HandleLeaveNotifyEvent;
- editor.MotionNotifyEvent -= HandleMotionNotifyEvent;
+ editor.TextArea.LeaveNotifyEvent -= HandleLeaveNotifyEvent;
+ editor.TextArea.MotionNotifyEvent -= HandleMotionNotifyEvent;
editor.EditorOptionsChanged -= HandleEditorEditorOptionsChanged;
if (textWidthDictionary != null) {
foreach (var l in textWidthDictionary.Values) {
Commit: 3e2661888a0bfda9bdb6c2b4e137c7d381bbda4c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-14 07:16:39 GMT
URL: https://github.com/mono/monodevelop/commit/3e2661888a0bfda9bdb6c2b4e137c7d381bbda4c
Fixed 'Bug 15868 - Wrong context for Anonymous method can be simplified to method group'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 354d61854b97a4ac2e250ff78a4cdd72f9aeb651
+Subproject commit b62c8870eeeebb83ef9c7ba14621668891b2f073
Commit: 5e6c53505ebd4616c66711de37137c9f2f575fc7
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-14 08:26:59 GMT
URL: https://github.com/mono/monodevelop/commit/5e6c53505ebd4616c66711de37137c9f2f575fc7
Fixed 'Bug 16020 - Pasting into unterminated string should not escape quotes'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit b62c8870eeeebb83ef9c7ba14621668891b2f073
+Subproject commit e25edd646f8deb343ce6d3f8e936f82a9792c8bc
Commit: ef394ec4ade829d0315b73afe5b77caa0a20f79c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-14 09:21:07 GMT
URL: https://github.com/mono/monodevelop/commit/ef394ec4ade829d0315b73afe5b77caa0a20f79c
Fixed 'Bug 15869 - Accessor never returns wrong context'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit e25edd646f8deb343ce6d3f8e936f82a9792c8bc
+Subproject commit 1b632607955422ba61ea54c3571f5d8192fab46f
Commit: b7002e4a46e42cb33912fb97ce5816ad65504350
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-14 11:50:51 GMT
URL: https://github.com/mono/monodevelop/commit/b7002e4a46e42cb33912fb97ce5816ad65504350
Merge pull request #432 from ekowahyudin/patch-1
Update GdbSession.cs
Changed paths:
M extras/MonoDevelop.Debugger.Gdb/GdbSession.cs
Modified: extras/MonoDevelop.Debugger.Gdb/GdbSession.cs
===================================================================
@@ -345,7 +345,7 @@ bool CheckBreakpoint (int handle)
RunCommand ("-break-condition", handle.ToString (), "(" + bp.ConditionExpression + ") != " + val);
}
- if (bp.HitAction == HitAction.PrintExpression) {
+ if (!string.IsNullOrEmpty (bp.TraceExpression) && bp.HitAction == HitAction.PrintExpression) {
GdbCommandResult res = RunCommand ("-data-evaluate-expression", Escape (bp.TraceExpression));
string val = res.GetValue ("value");
NotifyBreakEventUpdate (binfo, 0, val);
Commit: 1911436e9c2af217c2c56e086e40cdb78828e7ec
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-14 13:13:40 GMT
URL: https://github.com/mono/monodevelop/commit/1911436e9c2af217c2c56e086e40cdb78828e7ec
Fixed 'Bug 15218 - Saving causing a crash'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 1b632607955422ba61ea54c3571f5d8192fab46f
+Subproject commit 50733f502a2a38d836b464c1eb678ff636e2ae50
Commit: f8341eda2a0213de19b7cd7eb9b9144af9f6dca8
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-14 14:57:44 GMT
URL: https://github.com/mono/monodevelop/commit/f8341eda2a0213de19b7cd7eb9b9144af9f6dca8
[NUnit] Fix NRE when using a monomac-based custom runner
Changed paths:
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -472,7 +472,7 @@ UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test,
cmd.Arguments += " ";
cmd.Arguments += "\"-xml=" + outFile + "\" " + AssemblyPath;
- bool automaticUpdates = cmd.Command.Contains ("GuiUnit") || (cmd.Command.Contains ("mdtool.exe") && cmd.Arguments.Contains ("run-md-tests"));
+ bool automaticUpdates = cmd.Command != null && (cmd.Command.Contains ("GuiUnit") || (cmd.Command.Contains ("mdtool.exe") && cmd.Arguments.Contains ("run-md-tests")));
if (!string.IsNullOrEmpty(pathName))
cmd.Arguments += " -run=" + test.TestId;
if (automaticUpdates) {
Commit: 8beff2835baf22f88bbcb90fabc0a8e882209045
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-14 15:26:17 GMT
URL: https://github.com/mono/monodevelop/commit/8beff2835baf22f88bbcb90fabc0a8e882209045
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
version-checks
Changed paths:
M extras/AspNetEdit/AspNetEdit.addin.xml
M extras/AspNetEdit/configure
M extras/BooBinding/BooBinding.addin.xml
M extras/BooBinding/configure
M extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
M extras/GeckoWebBrowser/configure
M extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
M extras/JavaBinding/JavaBinding.addin.xml
M extras/JavaBinding/configure
M extras/LuaBinding/LuaBinding.addin.xml
M extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
M extras/MonoDevelop.AddinAuthoring/configure
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
M extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
M extras/MonoDevelop.Database/configure.in
M extras/MonoDevelop.Debugger.Gdb/GdbSession.cs
M extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Gdb/configure
M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
M extras/MonoDevelop.Debugger.Mdb/configure
M extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
M extras/MonoDevelop.MeeGo/configure
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
M extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
M extras/MonoDevelop.Profiling/configure.in
M extras/NemerleBinding/NemerleBinding.addin.xml
M extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
M extras/PyBinding/PyBinding/PyBinding.addin.xml
M extras/PyBinding/configure
M extras/ValaBinding/ValaBinding.addin.xml
M extras/ValaBinding/configure.in
M extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
M extras/WebKitWebBrowser/configure
M main/build/MacOSX/monostub.m
M main/configure.in
M main/external/debugger-libs
M main/external/guiunit
M main/external/nrefactory
M main/external/xwt
M main/src/addins/CBinding/CBinding.addin.xml
M main/src/addins/CBinding/Compiler/GNUCompiler.cs
M main/src/addins/CSharpBinding/CSharpBinding.addin.xml
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
M main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
M main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
M main/src/addins/ChangeLogAddIn/ChangeLogService.cs
M main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
M main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
M main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
M main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
M main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
M main/src/addins/MacPlatform/MacInterop/GtkQuartz.cs
M main/src/addins/MacPlatform/MacInterop/Keychain.cs
M main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
M main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs
M main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataType.cs
M main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
M main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
M main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
M main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GtkSpell.cs
M main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
M main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
M main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
M main/src/addins/MonoDevelop.GtkCore/libstetic/ParamSpec.cs
M main/src/addins/MonoDevelop.GtkCore/libsteticui/Metacity/Preview.cs
M main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
M main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
M main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
M main/src/addins/MonoDevelop.WebReferences/AddinInfo.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommands.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/UserPasswordDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WCFConfigWidget.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectFolderNodeBuilderExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/ProjectNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceFolderNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.NodeBuilders/WebReferenceNodeBuilder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ClientOptions.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/CollectionMapping.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ExtensionFile.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataFile.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/MetadataSource.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferenceGroup.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/ReferencedAssembly.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceDiscoveryResultWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WCF/WebServiceEngineWCF.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebReferenceUrl.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceDiscoveryResultWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.WS/WebServiceEngineWS.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryNetworkCredential.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/DiscoveryProtocol.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/MoonlightChannelBaseExtension.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceFolder.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferenceItem.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebReferencesService.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
M main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceEngine.cs
M main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
M main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
M main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
M main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
M main/src/addins/VBNetBinding/VBNetBinding.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
M main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
M main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
M main/src/addins/WindowsPlatform/GdkWin32.cs
M main/src/addins/WindowsPlatform/RecentFiles.cs
M main/src/addins/WindowsPlatform/Win32.cs
M main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
M main/src/addins/WindowsPlatform/WindowsPlatform.cs
M main/src/addins/WindowsPlatform/WindowsProxyCredentialProvider.cs
M main/src/addins/WindowsPlatform/WindowsSecureStoragePasswordProvider.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/GtkWorkarounds.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/PangoUtil.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/HelperMethods.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
M main/src/core/MonoDevelop.Core/BuildVariables.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssemblyService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessExtensions.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.ProgressMonitoring/ConsoleProgressMonitor.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/AddinSetupService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Text/TextFile.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/BuildTool.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components/CairoExtensions.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components/PangoCairoHelper.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/IdeFileSystemExtensionExtension.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/FeedbackService.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/GLibLogging.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
M main/src/tools/mdmonitor/MacIntegration/MacIntegration.cs
M main/src/tools/mdtool/src/mdtool.cs
M main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
M main/tests/UnitTests/MonoDevelop.CSharpBinding/OnTheFlyFormatterTests.cs
M main/tests/UnitTests/MonoDevelop.Refactoring/GroupingProviderTestBase.cs
M main/tests/UnitTests/UnitTests.csproj
Added paths:
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
A main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
A main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
A main/tests/UnitTests/MonoDevelop.Refactoring/FileGroupingProviderTests.cs
A main/tests/UnitTests/MonoDevelop.Refactoring/ProjectGroupingProviderTests.cs
Modified: extras/AspNetEdit/AspNetEdit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Visual Designer for ASP.NET Web Forms."
category = "Web Development"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "AspNetEdit.dll"/>
@@ -14,11 +14,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13" />
- <Addin id="AspNet" version="4.1.13" />
- <Addin id="DesignerSupport" version="4.1.13" />
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Deployment" version="4.2" />
+ <Addin id="AspNet" version="4.2" />
+ <Addin id="DesignerSupport" version="4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/DisplayBindings">
Modified: extras/AspNetEdit/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=aspnetedit
prefix=/usr/local
config=DEBUG
Modified: extras/BooBinding/BooBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://boo.codehaus.org"
description = "Boo Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "BooBinding.dll"/>
@@ -16,8 +16,8 @@
<Localizer type="Gettext" catalog="monodevelop-boo"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
<Assembly name="Boo.Lang.Compiler, Version=1.0.0.0" package="Boo" />
</Dependencies>
Modified: extras/BooBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/bin/bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-boo
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
+common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
usage ()
Modified: extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
url = "http://www.monodevelop.com"
description = "Mozilla Web Browser component using GeckoSharp and GtkMozEmbed"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/GeckoWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=geckowebbrowser
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.1.13"
+common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.2"
usage ()
Modified: extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = ""
description = "Provides a text editor for the MonoDevelop IDE based on GtkSourceView 2"
category = "MonoDevelop Core"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.SourceEditor.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<!-- Extension points -->
Modified: extras/JavaBinding/JavaBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Java Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
<Localizer type="Gettext" catalog="monodevelop-java"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/JavaBinding/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-java
prefix=/usr/local
config=DEBUG
Modified: extras/LuaBinding/LuaBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Lua Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "LuaBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
===================================================================
@@ -5,12 +5,12 @@
copyright = "MIT X11"
url = "http://www.monodevelop.com"
description = "This add-in provides utilities for creating Mono.Addins based libraries and applications"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="VersionControl" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="VersionControl" version="4.2"/>
</Dependencies>
<!-- Extension Points -->
Modified: extras/MonoDevelop.AddinAuthoring/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop_addinauthoring
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
+common_packages=" monodevelop;4.2 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
usage ()
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.CodeAnalysis.dll"/>
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.CodeAnalysis.dll"/>
Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
===================================================================
@@ -6,11 +6,11 @@
url = "http://code.google.com/p/md-codeanalysis"
description = "MonoDevelop CodeAnalysis addin"
category = "Code Analysis"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Ide/Commands">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database CodeGenerator Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Query" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Query" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Components Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Components.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database ConnectionManager Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Query" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Query" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Pads">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Designer Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Designer.dll"/>
@@ -15,9 +15,9 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
</Dependencies>
</Addin>
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Query Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Query.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Database/ToolBar/SqlQueryView">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/>
@@ -15,7 +15,7 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.2"/>
</Dependencies>
<Extension path = "/Mono/Data/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.MySql.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Database.Sql" version="4.1.13"/>
- <Addin id="Database.Components" version="4.1.13"/>
- <Addin id="Database.Designer" version="4.1.13"/>
- <Addin id="SourceEditor2" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Database.Sql" version="4.2"/>
+ <Addin id="Database.Components" version="4.2"/>
+ <Addin id="Database.Designer" version="4.2"/>
+ <Addin id="SourceEditor2" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Database/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/>
@@ -15,7 +15,7 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.2"/>
</Dependencies>
<Extension path = "/Mono/Data/Sql">
Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Database Module"
category = "Database"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
</Dependencies>
<Localizer type="Gettext" catalog="monodevelop-database"/>
Modified: extras/MonoDevelop.Database/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-database], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-database], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.4
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
GTKSHARP_REQUIRED_VERSION=2.12.8
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/MonoDevelop.Debugger.Gdb/GdbSession.cs
===================================================================
@@ -345,7 +345,7 @@ bool CheckBreakpoint (int handle)
RunCommand ("-break-condition", handle.ToString (), "(" + bp.ConditionExpression + ") != " + val);
}
- if (bp.HitAction == HitAction.PrintExpression) {
+ if (!string.IsNullOrEmpty (bp.TraceExpression) && bp.HitAction == HitAction.PrintExpression) {
GdbCommandResult res = RunCommand ("-data-evaluate-expression", Escape (bp.TraceExpression));
string val = res.GetValue ("value");
NotifyBreakEventUpdate (binfo, 0, val);
Modified: extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
description = "GNU Debugger support for Mono.Debugging"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Gdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-debugger-gdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13"
+common_packages=" monodevelop;4.2"
usage ()
Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
===================================================================
@@ -5,14 +5,14 @@
description = "Managed Debugging Engine support for MDB"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Mdb" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Mdb" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
description = "Managed Debugging Engine support for MDB"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-debugger-mdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
Modified: extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
===================================================================
@@ -6,19 +6,19 @@
url = "http://monodevelop.com/"
description = "Support for developing and deploying MeeGo applications using Mono."
category = "Mobile Development"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file = "Templates/MeeGoGtkProject.xpt.xml"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Debugger" version="4.1.13"/>
- <Addin id="Debugger.Soft" version="4.1.13"/>
- <Addin id="GtkCore" version="4.1.13"/>
- <Addin id="CSharpBinding" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Debugger" version="4.2"/>
+ <Addin id="Debugger.Soft" version="4.2"/>
+ <Addin id="GtkCore" version="4.2"/>
+ <Addin id="CSharpBinding" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
Modified: extras/MonoDevelop.MeeGo/configure
===================================================================
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
prefix=/usr/local
-common_packages=" mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
{
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "HeapBuddy Profiler Add-in"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapBuddy.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Profiling" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Profiling" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapBuddyProfilingSnapshotNode" name = "HeapBuddy snapshot node context menu">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "HeapShot Profiler Add-in"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapShot.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Profiling" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Profiling" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapShotProfilingSnapshotNode" name = "HeapShot snapshot node context menu">
Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "MonoDevelop Profiling Addin"
category = "Profiling"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="MonoDevelop.Profiling.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ToolBar/ProfilingPad" name = "Profiling pad toolbar">
Modified: extras/MonoDevelop.Profiling/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-profiling], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-profiling], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
@@ -42,7 +42,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
GTKSHARP_REQUIRED_VERSION=2.12.8
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/NemerleBinding/NemerleBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
url = "http://www.monodevelop.com"
description = "Nemerle Language Binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "NemerleBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/Ambiences">
Modified: extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com/"
description = "Samples for automating OpenOffice using Mono."
category = "Templates"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import file = "OpenOfficeSpreadsheetSample.xpt.xml"/>
@@ -18,8 +18,8 @@
</Runtime>
<Dependencies>
- <Addin id = "Ide" version="4.1.13"/>
- <Addin id = "CSharpBinding" version = "4.1.13" />
+ <Addin id = "Ide" version="4.2"/>
+ <Addin id = "CSharpBinding" version = "4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/ProjectTemplates">
Modified: extras/PyBinding/PyBinding/PyBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "Python Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "PyBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "SourceEditor2" version = "4.1.13"/>
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "SourceEditor2" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/PyBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=monodevelop-python
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
usage ()
Modified: extras/ValaBinding/ValaBinding.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Vala Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "Deployment" version = "4.1.13"/>
- <Addin id = "Deployment.Linux" version = "4.1.13"/>
- <Addin id = "Autotools" version = "4.1.13"/>
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "Deployment" version = "4.2"/>
+ <Addin id = "Deployment.Linux" version = "4.2"/>
+ <Addin id = "Autotools" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/ValaBinding/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-vala], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-vala], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE(1.9 tar-ustar)
AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
LIBVALA_REQUIRED_VERSION=0.12.0
PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)
Modified: extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
url = "http://www.monodevelop.com"
description = "WebKit Web Browser component"
category = "Platform Support"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/WebKitWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
PACKAGE=webkitwebbrowser
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 webkit-sharp-1.0;0.2"
+common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.2 webkit-sharp-1.0;0.2"
usage ()
Modified: main/build/MacOSX/monostub.m
===================================================================
@@ -269,7 +269,8 @@
char *variable;
char buf[32];
- push_env ("DYLD_FALLBACK_LIBRARY_PATH", "/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib");
+ /* CommandLineTools are needed for OSX 10.9+ */
+ push_env ("DYLD_FALLBACK_LIBRARY_PATH", "/Library/Frameworks/Mono.framework/Versions/Current/lib:/lib:/usr/lib:/Library/Developer/CommandLineTools/usr/lib");
/* Mono "External" directory */
push_env ("PKG_CONFIG_PATH", "/Library/Frameworks/Mono.framework/External/pkgconfig");
Modified: main/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 4.1.13, [[email protected]])
+AC_INIT([monodevelop], 4.2, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.10 tar-ustar])
AM_MAINTAINER_MODE
@@ -12,7 +12,7 @@ ASSEMBLY_VERSION=4.0.0.0
# the C# side of things. It should be one of the following two formats:
# 1) "VERSION_NUMBER" "2.0"
# 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER" "2.0 Alpha 1"
-PACKAGE_VERSION_LABEL="4.1.13"
+PACKAGE_VERSION_LABEL="4.2"
COMPAT_ADDIN_VERSION=4.0
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit dc63536bdeba18737d922bcf4731d3dd2e7a74a6
+Subproject commit e61a20e1451ff12ee4b0672cc9523ad2c612beb9
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 1fe9c1e7f5675a1cbdd9d8cc8c9b93df070501b6
+Subproject commit d7e684423ec8e7a6aaf9ed0bf585b09abb5120fb
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit a01f5b37b0ddcb072b63a55b0fa4b91cbcd716c1
+Subproject commit 50733f502a2a38d836b464c1eb678ff636e2ae50
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit dfc729dd856d1cceff7853a2648468d4f68d044e
+Subproject commit ef54d065c721ce013d2dc96284629441aba1672b
Modified: main/src/addins/CBinding/CBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
url = "http://www.monodevelop.com"
description = "C/C++ Language binding"
category = "Language bindings"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id = "Core" version = "4.1.13"/>
- <Addin id = "Ide" version = "4.1.13"/>
- <Addin id = "Deployment" version = "4.1.13"/>
- <Addin id = "Deployment.Linux" version = "4.1.13"/>
- <Addin id = "SourceEditor2" version = "4.1.13" />
- <Addin id = "DesignerSupport" version = "4.1.13" />
- <Addin id = "Refactoring" version = "4.1.13" />
+ <Addin id = "Core" version = "4.2"/>
+ <Addin id = "Ide" version = "4.2"/>
+ <Addin id = "Deployment" version = "4.2"/>
+ <Addin id = "Deployment.Linux" version = "4.2"/>
+ <Addin id = "SourceEditor2" version = "4.2" />
+ <Addin id = "DesignerSupport" version = "4.2" />
+ <Addin id = "Refactoring" version = "4.2" />
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -241,7 +241,7 @@
</Runtime>
<Dependencies>
- <Addin id = "MonoDevelop.Autotools" version = "4.1.13"/>
+ <Addin id = "MonoDevelop.Autotools" version = "4.2"/>
</Dependencies>
<Extension path = "/Autotools/SimpleSetups">
Modified: main/src/addins/CBinding/Compiler/GNUCompiler.cs
===================================================================
@@ -83,9 +83,9 @@ public abstract class GNUCompiler : CCompiler
string outputName = Path.Combine (configuration.OutputDirectory,
configuration.CompiledOutputName);
- // Precompile header files and place them in .prec/<config_name>/
+ // Precompile header files and place them in prec/<config_name>/
if (configuration.PrecompileHeaders) {
- string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
string precConfigDir = Path.Combine (precDir, configuration.Id);
if (!Directory.Exists (precDir))
Directory.CreateDirectory (precDir);
@@ -188,7 +188,7 @@ public override string GetCompilerFlags (Project project, CProjectConfiguration
args.Append ("-I\"" + StringParserService.Parse (inc, GetStringTags (project)) + "\" ");
if (configuration.PrecompileHeaders) {
- string precdir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precdir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
precdir = Path.Combine (precdir, configuration.Id);
args.Append ("-I\"" + precdir + "\"");
}
@@ -279,7 +279,7 @@ private string[] DependedOnFiles (ProjectFile file, CProjectConfiguration config
foreach (ProjectFile file in projectFiles) {
if (file.Subtype == Subtype.Code && CProject.IsHeaderFile (file.Name)) {
- string precomp = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precomp = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
precomp = Path.Combine (precomp, configuration.Id);
precomp = Path.Combine (precomp, Path.GetFileName (file.Name) + ".ghc");
if (file.BuildAction == BuildAction.Compile) {
@@ -623,10 +623,10 @@ public override void Clean (ProjectFileCollection projectFiles, CProjectConfigur
void CleanPrecompiledHeaders (CProjectConfiguration configuration)
{
- if (string.IsNullOrEmpty (configuration.SourceDirectory))
+ if (string.IsNullOrEmpty (configuration.IntermediateOutputDirectory))
return;
- string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+ string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
if (Directory.Exists (precDir))
Directory.Delete (precDir, true);
Modified: main/src/addins/CSharpBinding/CSharpBinding.addin.xml
===================================================================
@@ -273,7 +273,7 @@
<Import assembly="MonoDevelop.CSharpBinding.Autotools.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Autotools" version="4.1.13"/>
+ <Addin id="Autotools" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Autotools/SimpleSetups">
<Class class="CSharpBinding.Autotools.CSharpAutotoolsSetup" />
@@ -285,7 +285,7 @@
<Import assembly="MonoDevelop.CSharpBinding.AspNet.dll"/>
</Runtime>
<Dependencies>
- <Addin id="AspNet" version="4.1.13"/>
+ <Addin id="AspNet" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Asp/CompletionBuilders">
<Class class = "MonoDevelop.CSharp.Completion.AspLanguageBuilder" />
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextEditorIndentation.cs
===================================================================
@@ -56,7 +56,7 @@ class CSharpTextEditorIndentation : TextEditorExtension
}
}
- readonly IEnumerable<string> types = MonoDevelop.Ide.DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
+ readonly IEnumerable<string> types = DesktopService.GetMimeTypeInheritanceChain (CSharpFormatter.MimeType);
CSharpFormattingPolicy Policy {
get {
@@ -484,15 +484,17 @@ public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modif
lastCharInserted = TranslateKeyCharForIndenter (key, keyChar, textEditorData.GetCharAt (textEditorData.Caret.Offset - 1));
if (lastCharInserted == '\0')
return retval;
-
using (var undo = textEditorData.OpenUndoGroup ()) {
SafeUpdateIndentEngine (textEditorData.Caret.Offset);
if (key == Gdk.Key.Return && modifier == Gdk.ModifierType.ControlMask) {
FixLineStart (textEditorData, stateTracker, textEditorData.Caret.Line + 1);
} else {
- if (!(oldLine == textEditorData.Caret.Line + 1 && lastCharInserted == '\n') && (oldBufLen != textEditorData.Length || lastCharInserted != '\0'))
+ if (!(oldLine == textEditorData.Caret.Line + 1 && lastCharInserted == '\n') && (oldBufLen != textEditorData.Length || lastCharInserted != '\0')) {
DoPostInsertionSmartIndent (lastCharInserted, out reIndent);
+ } else {
+ reIndent = lastCharInserted == '\n';
+ }
}
//reindent the line after the insertion, if needed
//N.B. if the engine says we need to reindent, make sure that it's because a char was
@@ -510,7 +512,7 @@ public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modif
}
}
- if (key != Gdk.Key.Return && (reIndent || automaticReindent)) {
+ if (reIndent || key != Gdk.Key.Return && automaticReindent) {
using (var undo = textEditorData.OpenUndoGroup ()) {
DoReSmartIndent ();
}
@@ -542,6 +544,10 @@ public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modif
//and calls HandleCodeCompletion etc to handles completion
var result = base.KeyPress (key, keyChar, modifier);
+ if (key == Gdk.Key.Return || key == Gdk.Key.KP_Enter) {
+ DoReSmartIndent ();
+ }
+
CheckXmlCommentCloseTag (keyChar);
if (!skipFormatting && keyChar == '}')
Modified: main/src/addins/ChangeLogAddIn/AddLogEntryDialog.cs
===================================================================
@@ -33,12 +33,12 @@
namespace MonoDevelop.ChangeLogAddIn
{
- internal partial class AddLogEntryDialog : Gtk.Dialog
+ partial class AddLogEntryDialog : Dialog
{
- ListStore store;
- Dictionary<ChangeLogEntry,string> changes = new Dictionary<ChangeLogEntry,string> ();
- TextMark editMark;
- TextTag oldTextTag;
+ readonly ListStore store;
+ readonly Dictionary<ChangeLogEntry, string> changes = new Dictionary<ChangeLogEntry, string> ();
+ readonly TextMark editMark;
+ readonly TextTag oldTextTag;
bool loading;
public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
@@ -52,8 +52,8 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
Pango.TabArray tabs = new Pango.TabArray (1, true);
tabs.SetTab (0, Pango.TabAlign.Left, GetStringWidth (" ") * 4);
textview.Tabs = tabs;
- textview.SizeRequested += delegate (object o, SizeRequestedArgs args) {
- textview.WidthRequest = GetStringWidth (string.Empty.PadRight (80));
+ textview.SizeRequested += delegate {
+ textview.WidthRequest = GetStringWidth (String.Empty.PadRight (80));
};
font.Dispose ();
@@ -66,9 +66,9 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
foreach (ChangeLogEntry ce in entries.Values) {
Gdk.Pixbuf pic;
if (ce.CantGenerate)
- pic = ImageService.GetPixbuf (Gtk.Stock.DialogWarning, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.DialogWarning, IconSize.Menu);
else if (ce.IsNew)
- pic = ImageService.GetPixbuf (Gtk.Stock.New, Gtk.IconSize.Menu);
+ pic = ImageService.GetPixbuf (Stock.New, IconSize.Menu);
else
pic = null;
store.AppendValues (ce, pic, ce.File);
@@ -78,7 +78,7 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
TreeIter it;
editMark = textview.Buffer.CreateMark (null, textview.Buffer.EndIter, false);
- oldTextTag = new Gtk.TextTag ("readonly");
+ oldTextTag = new TextTag ("readonly");
oldTextTag.Foreground = "gray";
oldTextTag.Editable = false;
textview.Buffer.TagTable.Add (oldTextTag);
@@ -87,10 +87,10 @@ public AddLogEntryDialog (Dictionary<string,ChangeLogEntry> entries)
fileList.Selection.SelectIter (it);
}
- private int GetStringWidth (string str)
+ int GetStringWidth (string str)
{
int width, height;
- Pango.Layout layout = new Pango.Layout (textview.PangoContext);
+ var layout = new Pango.Layout (textview.PangoContext);
layout.SetText (str);
layout.GetPixelSize (out width, out height);
layout.Dispose ();
@@ -105,7 +105,7 @@ public void OnSelectionChanged (object s, EventArgs a)
textview.Sensitive = false;
} else {
textview.Sensitive = true;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
boxNewFile.Visible = ce.IsNew && !ce.CantGenerate;
boxNoFile.Visible = ce.CantGenerate;
loading = true;
@@ -132,7 +132,7 @@ public void OnTextChanged (object s, EventArgs a)
TreeIter it;
if (!fileList.Selection.GetSelected (out it))
return;
- ChangeLogEntry ce = (ChangeLogEntry) store.GetValue (it, 0);
+ var ce = (ChangeLogEntry) store.GetValue (it, 0);
changes [ce] = textview.Buffer.GetText (textview.Buffer.StartIter, textview.Buffer.GetIterAtMark (editMark), true);
}
Modified: main/src/addins/ChangeLogAddIn/ChangeLogAddIn.cs
===================================================================
@@ -64,23 +64,21 @@ protected override void Update(CommandInfo info)
info.Enabled = false;
}
- private string GetSelectedFile()
+ static string GetSelectedFile()
{
if (IdeApp.Workbench.ActiveDocument != null) {
string fn = IdeApp.Workbench.ActiveDocument.FileName;
if (fn != null && Path.GetFileName (fn) != "ChangeLog")
return fn;
}
- ProjectFile file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
+ var file = IdeApp.ProjectOperations.CurrentSelectedItem as ProjectFile;
if (file != null)
return file.FilePath;
- SystemFile sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
- if (sf != null)
- return sf.Path;
- return null;
+ var sf = IdeApp.ProjectOperations.CurrentSelectedItem as SystemFile;
+ return sf != null ? sf.Path : null;
}
- private void InsertEntry(Document document)
+ static void InsertEntry(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return;
@@ -92,7 +90,7 @@ private void InsertEntry(Document document)
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
int pos = GetHeaderEndPosition (document);
- if (pos > 0 && selectedFileNameDirectory.StartsWith(changeLogFileNameDirectory)) {
+ if (pos > 0 && selectedFileNameDirectory.StartsWith (changeLogFileNameDirectory, StringComparison.Ordinal)) {
string text = "\t* "
+ selectedFileName.Substring(changeLogFileNameDirectory.Length + 1) + ": "
+ eol + eol;
@@ -107,7 +105,7 @@ private void InsertEntry(Document document)
}
}
- private bool InsertHeader (Document document)
+ static bool InsertHeader (Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return false;
@@ -133,7 +131,7 @@ private bool InsertHeader (Document document)
return true;
}
- private int GetHeaderEndPosition(Document document)
+ static int GetHeaderEndPosition(Document document)
{
IEditableTextBuffer textBuffer = document.GetContent<IEditableTextBuffer>();
if (textBuffer == null) return 0;
@@ -143,10 +141,10 @@ private int GetHeaderEndPosition(Document document)
string text = textBuffer.GetText (0, Math.Min (textBuffer.Length, 1023));
string eol = document.Editor != null ? document.Editor.EolMarker : Environment.NewLine;
- return text.IndexOf (eol + eol);
+ return text.IndexOf (eol + eol, StringComparison.Ordinal);
}
- private Document GetActiveChangeLogDocument()
+ static Document GetActiveChangeLogDocument()
{
string file = GetSelectedFile ();
if (file == null)
Modified: main/src/addins/ChangeLogAddIn/ChangeLogService.cs
===================================================================
@@ -115,11 +115,7 @@ public static string GetChangeLogForFile (string baseCommitPath, string file)
public static CommitMessageStyle GetMessageStyle (SolutionItem item)
{
- ChangeLogPolicy policy;
- if (item != null)
- policy = GetPolicy (item);
- else
- policy = new ChangeLogPolicy ();
+ ChangeLogPolicy policy = item != null ? GetPolicy (item) : new ChangeLogPolicy ();
return policy.MessageStyle;
}
Modified: main/src/addins/ChangeLogAddIn/CommitDialogExtensionWidget.cs
===================================================================
@@ -32,7 +32,6 @@
using MonoDevelop.VersionControl;
using MonoDevelop.Core;
using MonoDevelop.Projects.Text;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide;
using MonoDevelop.Projects;
@@ -40,10 +39,10 @@ namespace MonoDevelop.ChangeLogAddIn
{
public class CommitDialogExtensionWidget: CommitDialogExtension
{
- HBox box = new HBox ();
- VBox vbox = new VBox ();
- Button logButton;
- Button optionsButton;
+ readonly HBox box = new HBox ();
+ readonly VBox vbox = new VBox ();
+ readonly Button logButton;
+ readonly Button optionsButton;
ChangeSet cset;
Label msgLabel;
Label pathLabel;
@@ -65,18 +64,18 @@ public CommitDialogExtensionWidget()
optionsButton = new Button (GettextCatalog.GetString ("Options..."));
optionsButton.Clicked += OnClickOptions;
- VBox aux = new VBox ();
+ var aux = new VBox ();
box.PackStart (aux, false, false, 3);
- HBox haux = new HBox ();
+ var haux = new HBox ();
haux.Spacing = 6;
aux.PackStart (haux, false, false, 0);
haux.PackStart (logButton, false, false, 0);
haux.PackStart (optionsButton, false, false, 0);
}
- public override bool Initialize (ChangeSet cset)
+ public override bool Initialize (ChangeSet changeSet)
{
- this.cset = cset;
+ cset = changeSet;
msgLabel = new Label ();
pathLabel = new Label ();
msgLabel.Xalign = 0;
@@ -227,7 +226,7 @@ void GenerateLogEntries ()
requireComment = false;
foreach (ChangeSetItem item in cset.Items) {
- MonoDevelop.Projects.SolutionItem parentItem;
+ SolutionItem parentItem;
ChangeLogPolicy policy;
string logf = ChangeLogService.GetChangeLogForFile (cset.BaseLocalPath, item.LocalPath,
out parentItem, out policy);
@@ -246,8 +245,7 @@ void GenerateLogEntries ()
if (string.IsNullOrEmpty (item.Comment) && !item.IsDirectory) {
uncommentedCount++;
- if (policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry)
- requireComment = true;
+ requireComment |= policy != null && policy.VcsIntegration == VcsIntegration.RequireEntry;
}
ChangeLogEntry entry;
@@ -260,15 +258,14 @@ void GenerateLogEntries ()
if (cantGenerate)
unknownFileCount++;
- if (!File.Exists (logf))
- entry.IsNew = true;
+ entry.IsNew |= !File.Exists (logf);
entries [logf] = entry;
}
entry.Items.Add (item);
}
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.TabsAsSpaces = false;
format.TabWidth = 8;
format.MaxColumns = 70;
@@ -283,19 +280,19 @@ void GenerateLogEntries ()
void OnClickButton (object s, EventArgs args)
{
if (notConfigured) {
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
return;
}
var dlg = new AddLogEntryDialog (entries);
- MessageService.ShowCustomDialog (dlg, (Gtk.Window) Toplevel);
+ MessageService.ShowCustomDialog (dlg, (Window) Toplevel);
}
void OnClickOptions (object s, EventArgs args)
{
- IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Gtk.Window, "GeneralAuthorInfo");
+ IdeApp.Workbench.ShowGlobalPreferencesDialog (Toplevel as Window, "GeneralAuthorInfo");
UpdateStatus ();
GenerateLogEntries ();
}
Modified: main/src/addins/ChangeLogAddIn/OldChangeLogData.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.ChangeLogAddIn
class OldChangeLogData
{
[ItemProperty]
- ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
+ readonly ChangeLogPolicyEnum policy = ChangeLogPolicyEnum.UseParentPolicy;
OldChangeLogData ()
{
@@ -55,7 +55,7 @@ public static void Migrate (SolutionItem entry)
if (entry.ParentFolder != null)
Migrate (entry.ParentFolder);
- OldChangeLogData data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
+ var data = entry.ExtendedProperties ["MonoDevelop.ChangeLogAddIn.ChangeLogInfo"] as OldChangeLogData;
if (data == null)
return;
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanel.cs
===================================================================
@@ -43,11 +43,14 @@ public override Widget CreatePanelWidget ()
public override void Initialize (OptionsDialog dialog, object dataObject)
{
- if (dataObject is SolutionItem)
- OldChangeLogData.Migrate ((SolutionItem)dataObject);
- else if (dataObject is Solution)
- OldChangeLogData.Migrate (((Solution)dataObject).RootFolder);
-
+ var solutionItem = dataObject as SolutionItem;
+ if (solutionItem != null)
+ OldChangeLogData.Migrate (solutionItem);
+ else {
+ var solution = dataObject as Solution;
+ if (solution != null)
+ OldChangeLogData.Migrate (solution.RootFolder);
+ }
base.Initialize (dialog, dataObject);
}
Modified: main/src/addins/ChangeLogAddIn/ProjectOptionPanelWidget.cs
===================================================================
@@ -25,16 +25,14 @@
//
//
-using System;
using MonoDevelop.Projects;
using MonoDevelop.VersionControl;
-using MonoDevelop.Ide;
namespace MonoDevelop.ChangeLogAddIn
{
partial class ProjectOptionPanelWidget : Gtk.Bin
{
- ProjectOptionPanel parent;
+ readonly ProjectOptionPanel parent;
CommitMessageStyle style;
public ProjectOptionPanelWidget (ProjectOptionPanel parent)
@@ -60,13 +58,13 @@ public void LoadFrom (ChangeLogPolicy policy)
break;
}
- this.checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
- this.checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
+ checkVersionControl.Active = policy.VcsIntegration != VcsIntegration.None;
+ checkRequireOnCommit.Active = policy.VcsIntegration == VcsIntegration.RequireEntry;
style = new CommitMessageStyle ();
style.CopyFrom (policy.MessageStyle);
- CommitMessageFormat format = new CommitMessageFormat ();
+ var format = new CommitMessageFormat ();
format.MaxColumns = 70;
format.Style = style;
Modified: main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = "http://www.monodevelop.com"
description = "Provides basic deployment services for Linux"
category = "Deployment"
- version = "4.1.13"
+ version = "4.2"
flags = "Hidden"
compatVersion = "4.0">
@@ -15,9 +15,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="Deployment" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com"
description = "Provides basic deployment services"
category = "Deployment"
- version = "4.1.13"
+ version = "4.2"
flags = "Hidden"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/MacPlatform/MacInterop/GtkQuartz.cs
===================================================================
@@ -34,6 +34,8 @@ namespace MonoDevelop.MacInterop
{
public static class GtkQuartz
{
+ const string LIBQUARTZ = "libgtk-quartz-2.0.dylib";
+
//this may be needed to work around focusing issues in GTK/Cocoa interop
public static void FocusWindow (Gtk.Window widget)
{
@@ -79,10 +81,10 @@ public static NSView GetView (Gtk.Widget widget)
return MonoMac.ObjCRuntime.Runtime.GetNSObject (ptr) as NSView;
}
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nsview (IntPtr window);
- [DllImport ("libgtk-quartz-2.0.dylib")]
+ [DllImport (LIBQUARTZ)]
static extern IntPtr gdk_quartz_window_get_nswindow (IntPtr window);
}
}
Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -26,13 +26,8 @@
// THE SOFTWARE.
using System;
-using System.Linq;
using System.Text;
-using System.Collections.Generic;
using System.Runtime.InteropServices;
-using System.Security.Cryptography.X509Certificates;
-
-using MonoDevelop.Core;
namespace MonoDevelop.MacInterop
{
@@ -249,19 +244,20 @@ static string CFStringGetString (IntPtr handle)
if (handle == IntPtr.Zero)
return null;
- string str;
-
- int l = CFStringGetLength (handle);
- IntPtr u = CFStringGetCharactersPtr (handle);
+ int length = CFStringGetLength (handle);
+ var unicode = CFStringGetCharactersPtr (handle);
IntPtr buffer = IntPtr.Zero;
- if (u == IntPtr.Zero){
- CFRange r = new CFRange (0, l);
- buffer = Marshal.AllocCoTaskMem (l * 2);
- CFStringGetCharacters (handle, r, buffer);
- u = buffer;
+ string str;
+
+ if (unicode == IntPtr.Zero){
+ var range = new CFRange (0, length);
+ buffer = Marshal.AllocCoTaskMem (length * 2);
+ CFStringGetCharacters (handle, range, buffer);
+ unicode = buffer;
}
+
unsafe {
- str = new string ((char *) u, 0, l);
+ str = new string ((char *) unicode, 0, length);
}
if (buffer != IntPtr.Zero)
@@ -272,34 +268,6 @@ static string CFStringGetString (IntPtr handle)
#endregion
- #region CFMutableDictionary
-
-// struct CFDictionaryKeyCallBacks {
-// CFIndex version;
-// CFDictionaryRetainCallBack retain;
-// CFDictionaryReleaseCallBack release;
-// CFDictionaryCopyDescriptionCallBack copyDescription;
-// CFDictionaryEqualCallBack equal;
-// CFDictionaryHashCallBack hash;
-// };
-//
-// struct CFDictionaryValueCallBacks {
-// CFIndex version;
-// CFDictionaryRetainCallBack retain;
-// CFDictionaryReleaseCallBack release;
-// CFDictionaryCopyDescriptionCallBack copyDescription;
-// CFDictionaryEqualCallBack equal;
-// };
-
- // use kCFTypeDictionaryKeyCallBacks and kCFTypeDictionaryValueCallBacks
-
- // CFDictionaryRef CFDictionaryCreate (CFAllocatorRef allocator, const void **keys, const void **values, CFIndex numValues, const CFDictionaryKeyCallBacks *keyCallBacks, const CFDictionaryValueCallBacks *valueCallBacks);
- // CFMutableDictionaryRef CFDictionaryCreateMutable (CFAllocatorRef allocator, CFIndex capacity, const CFDictionaryKeyCallBacks *keyCallBacks, const CFDictionaryValueCallBacks *valueCallBacks);
-
- // void CFDictionaryAddValue (CFMutableDictionaryRef theDict, const void *key, const void *value);
-
- #endregion
-
static string GetError (OSStatus status)
{
IntPtr str = IntPtr.Zero;
@@ -555,11 +523,8 @@ static unsafe string GetUsernameFromKeychainItemRef (IntPtr itemRef)
0, null, (uint) path.Length, path, (ushort) uri.Port,
protocol, auth, out passwordLength, out passwordData, ref item);
- if (result == OSStatus.ItemNotFound)
- return null;
-
if (result != OSStatus.Ok)
- throw new Exception ("Could not find internet username and password: " + GetError (result));
+ return null;
var username = GetUsernameFromKeychainItemRef (item);
@@ -591,11 +556,8 @@ public static string FindInternetPassword (Uri uri)
CFRelease (item);
- if (result == OSStatus.ItemNotFound)
- return null;
-
if (result != OSStatus.Ok)
- throw new Exception ("Could not find internet password: " + GetError (result));
+ return null;
return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
}
Modified: main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
===================================================================
@@ -7,15 +7,15 @@
url = "http://www.monodevelop.com/"
description = "Provides code metric support for monodevelop"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly = "MonoDevelop.CodeMetrics.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/Commands">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Mono Soft Debugger Support for ASP.NET"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Mono Soft Debugger Support for Moonlight"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.Moonlight" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.Moonlight" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
===================================================================
@@ -5,11 +5,11 @@
description = "Mono Soft Debugger Support"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
</Dependencies>
<Runtime>
Modified: main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataPropertyInfo.cs
===================================================================
@@ -83,6 +83,12 @@ internal MetadataPropertyInfo (IMetadataImport importer, int propertyToken, Meta
m_propAttributes = (PropertyAttributes) pdwPropFlags;
m_name = szProperty.ToString ();
MetadataHelperFunctions.GetCustomAttribute (importer, propertyToken, typeof (System.Diagnostics.DebuggerBrowsableAttribute));
+
+ if (!m_importer.IsValidToken ((uint)m_pmdGetter))
+ m_pmdGetter = 0;
+
+ if (!m_importer.IsValidToken ((uint)m_pmdSetter))
+ m_pmdSetter = 0;
}
public override PropertyAttributes Attributes
@@ -107,11 +113,15 @@ public override MethodInfo[] GetAccessors (bool nonPublic)
public override MethodInfo GetGetMethod (bool nonPublic)
{
- if (m_getter == null) {
- if (m_pmdGetter != 0)
- m_getter = new MetadataMethodInfo (m_importer, m_pmdGetter);
- }
- return m_getter;
+ if (m_pmdGetter == 0)
+ return null;
+
+ if (m_getter == null)
+ m_getter = new MetadataMethodInfo (m_importer, m_pmdGetter);
+
+ if (nonPublic || m_getter.IsPublic)
+ return m_getter;
+ return null;
}
public override ParameterInfo[] GetIndexParameters ( )
@@ -124,11 +134,15 @@ public override ParameterInfo[] GetIndexParameters ( )
public override MethodInfo GetSetMethod (bool nonPublic)
{
- if (m_setter == null) {
- if (m_pmdSetter != 0)
- m_setter = new MetadataMethodInfo (m_importer, m_pmdSetter);
- }
- return m_setter;
+ if (m_pmdSetter == 0)
+ return null;
+
+ if (m_setter == null)
+ m_setter = new MetadataMethodInfo (m_importer, m_pmdSetter);
+
+ if (nonPublic || m_setter.IsPublic)
+ return m_setter;
+ return null;
}
public override object GetValue (object obj, BindingFlags invokeAttr, Binder binder, object[] index, System.Globalization.CultureInfo culture)
Modified: main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/Metadata/MetadataType.cs
===================================================================
@@ -423,9 +423,9 @@ public override PropertyInfo[] GetProperties(BindingFlags bindingAttr)
break;
MetadataPropertyInfo prop = new MetadataPropertyInfo (m_importer, methodToken, this);
try {
- MethodInfo mi = prop.GetGetMethod ();
+ MethodInfo mi = prop.GetGetMethod () ?? prop.GetSetMethod ();
if (mi == null)
- mi = prop.GetSetMethod ();
+ continue;
if (FlagsMatch (mi.IsPublic, mi.IsStatic, bindingAttr))
al.Add (prop);
}
Modified: main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
===================================================================
@@ -5,13 +5,13 @@
description = "Managed Debugging Engine support for MS.NET"
copyright = "MIT X11"
category = "Debugging"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.13"/>
- <Addin id="MonoDevelop.Ide" version="4.1.13"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+ <Addin id="MonoDevelop.Core" version="4.2"/>
+ <Addin id="MonoDevelop.Ide" version="4.2"/>
+ <Addin id="MonoDevelop.Debugger" version="4.2"/>
+ <Addin id="MonoDevelop.AspNet" version="4.2"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
===================================================================
@@ -6,11 +6,11 @@
description = "Support for Debugging projects"
copyright = "MIT X11"
flags = "Hidden"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
</Dependencies>
<ExtensionPoint path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
===================================================================
@@ -22,8 +22,8 @@
<Execution>
<Execution clr-version="Net_2_0" />
</Execution>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,8 +36,8 @@
<Execution clr-version="Net_2_0" />
</Execution>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -149,6 +149,7 @@
<Compile Include="MonoDevelop.Debugger\DebuggerConsoleView.cs" />
<Compile Include="MonoDevelop.Debugger.Visualizer\CStringVisualizer.cs" />
<Compile Include="MonoDevelop.Debugger.Visualizer\ValueVisualizer.cs" />
+ <Compile Include="MonoDevelop.Debugger\InfoFrame.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MonoDevelop.Debugger.addin.xml">
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
===================================================================
@@ -38,29 +38,34 @@ namespace MonoDevelop.Debugger
{
public partial class ExceptionCaughtWidget : Gtk.Bin
{
- Gtk.TreeStore stackStore;
- ExceptionInfo exception;
+ readonly Gtk.TreeStore stackStore;
+ readonly ExceptionInfo exception;
bool destroyed;
public ExceptionCaughtWidget (ExceptionInfo exception)
{
this.Build ();
+ vboxExceptionInfo.Remove (labelMessage);
+ var frame = new InfoFrame (labelMessage);
+ frame.Show ();
+ vboxExceptionInfo.PackStart (frame, false, true, 0);
+
stackStore = new TreeStore (typeof(string), typeof(string), typeof(int), typeof(int));
treeStack.Model = stackStore;
var crt = new CellRendererText ();
+ crt.Ellipsize = Pango.EllipsizeMode.End;
+ crt.WrapWidth = -1;
treeStack.AppendColumn ("", crt, "markup", 0);
treeStack.ShowExpanders = false;
+ treeStack.RulesHint = true;
valueView.AllowExpanding = true;
valueView.Frame = DebuggingService.CurrentFrame;
this.exception = exception;
exception.Changed += HandleExceptionChanged;
- treeStack.SizeAllocated += delegate(object o, SizeAllocatedArgs args) {
- if (crt.WrapWidth != args.Allocation.Width)
- crt.WrapWidth = args.Allocation.Width;
- };
+ treeStack.SizeAllocated += (object o, SizeAllocatedArgs args) => crt.WrapWidth = args.Allocation.Width;
Fill ();
treeStack.RowActivated += HandleRowActivated;
@@ -68,11 +73,13 @@ public ExceptionCaughtWidget (ExceptionInfo exception)
void HandleRowActivated (object o, RowActivatedArgs args)
{
- Gtk.TreeIter it;
- if (!stackStore.GetIter (out it, args.Path))
+ TreeIter iter;
+
+ if (!stackStore.GetIter (out iter, args.Path))
return;
- string file = (string) stackStore.GetValue (it, 1);
- int line = (int) stackStore.GetValue (it, 2);
+
+ string file = (string) stackStore.GetValue (iter, 1);
+ int line = (int) stackStore.GetValue (iter, 2);
if (!string.IsNullOrEmpty (file))
IdeApp.Workbench.OpenDocument (file, line, 0);
}
@@ -103,6 +110,7 @@ void Fill ()
valueView.AddValue (exception.Instance);
valueView.ExpandRow (new TreePath ("0"), false);
}
+
if (exception.StackIsEvaluating) {
stackStore.AppendValues (GettextCatalog.GetString ("Loading..."), "", 0, 0);
}
@@ -110,11 +118,12 @@ void Fill ()
void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
{
- TreeIter it = TreeIter.Zero;
+ TreeIter iter = TreeIter.Zero;
+
if (showExceptionNode) {
treeStack.ShowExpanders = true;
string tn = exc.Type + ": " + exc.Message;
- it = stackStore.AppendValues (tn, null, 0, 0);
+ iter = stackStore.AppendValues (tn, null, 0, 0);
}
foreach (ExceptionStackFrame frame in exc.StackTrace) {
@@ -129,8 +138,8 @@ void ShowStackTrace (ExceptionInfo exc, bool showExceptionNode)
text += "</small>";
}
- if (!it.Equals (TreeIter.Zero))
- stackStore.AppendValues (it, text, frame.File, frame.Line, frame.Column);
+ if (!iter.Equals (TreeIter.Zero))
+ stackStore.AppendValues (iter, text, frame.File, frame.Line, frame.Column);
else
stackStore.AppendValues (text, frame.File, frame.Line, frame.Column);
}
@@ -150,9 +159,9 @@ protected override void OnDestroyed ()
class ExceptionCaughtDialog: Gtk.Dialog
{
- ExceptionCaughtWidget widget;
- ExceptionInfo ex;
- ExceptionCaughtMessage msg;
+ readonly ExceptionCaughtWidget widget;
+ readonly ExceptionCaughtMessage msg;
+ readonly ExceptionInfo ex;
public ExceptionCaughtDialog (ExceptionInfo val, ExceptionCaughtMessage msg)
{
@@ -206,10 +215,10 @@ void HandleCopyClicked (object sender, EventArgs e)
class ExceptionCaughtMessage : IDisposable
{
- ExceptionInfo ex;
+ ExceptionCaughtMiniButton miniButton;
ExceptionCaughtDialog dialog;
ExceptionCaughtButton button;
- ExceptionCaughtMiniButton miniButton;
+ readonly ExceptionInfo ex;
public ExceptionCaughtMessage (ExceptionInfo val, FilePath file, int line, int col)
{
@@ -299,11 +308,11 @@ public void Close ()
class ExceptionCaughtButton: TopLevelWidgetExtension
{
- ExceptionCaughtMessage dlg;
- ExceptionInfo exception;
+ readonly ExceptionCaughtMessage dlg;
+ readonly ExceptionInfo exception;
Gtk.Label messageLabel;
- Xwt.Drawing.Image closeSelImage;
- Xwt.Drawing.Image closeSelOverImage;
+ readonly Xwt.Drawing.Image closeSelImage;
+ readonly Xwt.Drawing.Image closeSelOverImage;
public ExceptionCaughtButton (ExceptionInfo val, ExceptionCaughtMessage dlg, FilePath file, int line)
{
@@ -393,7 +402,7 @@ void LoadData ()
class ExceptionCaughtMiniButton: TopLevelWidgetExtension
{
- ExceptionCaughtMessage dlg;
+ readonly ExceptionCaughtMessage dlg;
public ExceptionCaughtMiniButton (ExceptionCaughtMessage dlg, FilePath file, int line)
{
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/InfoFrame.cs
===================================================================
@@ -0,0 +1,57 @@
+//
+// InfoFrame.cs
+//
+// Author:
+// Jeffrey Stedfast <[email protected]>
+//
+// Copyright (c) 2013 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+
+using Gtk;
+
+namespace MonoDevelop.Debugger
+{
+ [System.ComponentModel.ToolboxItem (true)]
+ class InfoFrame : Gtk.Frame
+ {
+ public InfoFrame ()
+ {
+ Shadow = ShadowType.EtchedIn;
+ }
+
+ public InfoFrame (Widget child) : this ()
+ {
+ Child = child;
+ }
+
+ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
+ {
+ using (Cairo.Context cr = Gdk.CairoHelper.Create (GdkWindow)) {
+ cr.Rectangle (Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
+ cr.SetSourceRGB (1.0, 0.98, 0.91);
+ cr.Fill ();
+ }
+
+ return base.OnExposeEvent (evnt);
+ }
+ }
+}
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
===================================================================
@@ -45,23 +45,25 @@
namespace MonoDevelop.Debugger
{
[System.ComponentModel.ToolboxItem (true)]
- public class ObjectValueTreeView: Gtk.TreeView, ICompletionWidget
+ public class ObjectValueTreeView : TreeView, ICompletionWidget
{
- List<string> valueNames = new List<string> ();
- Dictionary<string,string> oldValues = new Dictionary<string,string> ();
- List<ObjectValue> values = new List<ObjectValue> ();
- Dictionary<ObjectValue,TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
- Dictionary<string,ObjectValue> cachedValues = new Dictionary<string,ObjectValue> ();
- Dictionary<ObjectValue, Task> expandTasks = new Dictionary<ObjectValue, Task> ();
- TreeStore store;
- TreeViewState state;
- string createMsg;
+ readonly Dictionary<ObjectValue, TreeRowReference> nodes = new Dictionary<ObjectValue, TreeRowReference> ();
+ readonly Dictionary<string, ObjectValue> cachedValues = new Dictionary<string, ObjectValue> ();
+ readonly Dictionary<ObjectValue, Task> expandTasks = new Dictionary<ObjectValue, Task> ();
+ readonly Dictionary<string, string> oldValues = new Dictionary<string, string> ();
+ readonly List<ObjectValue> values = new List<ObjectValue> ();
+ readonly List<string> valueNames = new List<string> ();
+
+ readonly Gdk.Pixbuf noLiveIcon;
+ readonly Gdk.Pixbuf liveIcon;
+
+ readonly TreeViewState state;
+ readonly TreeStore store;
+ readonly string createMsg;
bool restoringState = false;
bool compact;
StackFrame frame;
bool disposed;
- Gdk.Pixbuf noLiveIcon;
- Gdk.Pixbuf liveIcon;
bool columnsAdjusted;
bool columnSizesUpdating;
@@ -70,26 +72,26 @@ public class ObjectValueTreeView: Gtk.TreeView, ICompletionWidget
double valueColWidth;
double typeColWidth;
- CellRendererText crtExp;
- CellRendererText crtValue;
- CellRendererText crtType;
- CellRendererIcon crpButton;
- CellRendererIcon crpPin;
- CellRendererIcon crpLiveUpdate;
- CellRendererIcon crpViewer;
- Gtk.Entry editEntry;
+ readonly CellRendererText crtExp;
+ readonly CellRendererText crtValue;
+ readonly CellRendererText crtType;
+ readonly CellRendererIcon crpButton;
+ readonly CellRendererIcon crpPin;
+ readonly CellRendererIcon crpLiveUpdate;
+ readonly CellRendererIcon crpViewer;
+ Entry editEntry;
Mono.Debugging.Client.CompletionData currentCompletionData;
- TreeViewColumn expCol;
- TreeViewColumn valueCol;
- TreeViewColumn typeCol;
- TreeViewColumn pinCol;
+ readonly TreeViewColumn expCol;
+ readonly TreeViewColumn valueCol;
+ readonly TreeViewColumn typeCol;
+ readonly TreeViewColumn pinCol;
- string errorColor = "red";
- string modifiedColor = "blue";
- string disabledColor = "gray";
+ const string errorColor = "red";
+ const string modifiedColor = "blue";
+ const string disabledColor = "gray";
- static CommandEntrySet menuSet;
+ static readonly CommandEntrySet menuSet;
const int NameCol = 0;
const int ValueCol = 1;
@@ -138,7 +140,7 @@ public ObjectValueTreeView ()
Pango.FontDescription newFont = this.Style.FontDescription.Copy ();
newFont.Size = (newFont.Size * 8) / 10;
- liveIcon = ImageService.GetPixbuf (Gtk.Stock.Execute, IconSize.Menu);
+ liveIcon = ImageService.GetPixbuf (Stock.Execute, IconSize.Menu);
noLiveIcon = ImageService.MakeTransparent (liveIcon, 0.5);
expCol = new TreeViewColumn ();
@@ -161,12 +163,12 @@ public ObjectValueTreeView ()
valueCol = new TreeViewColumn ();
valueCol.Title = GettextCatalog.GetString ("Value");
crpViewer = new CellRendererIcon ();
- crpViewer.IconId = Gtk.Stock.ZoomIn;
+ crpViewer.IconId = Stock.ZoomIn;
valueCol.PackStart (crpViewer, false);
valueCol.AddAttribute (crpViewer, "visible", ViewerButtonVisibleCol);
crpButton = new CellRendererIcon ();
- crpButton.StockSize = (uint)Gtk.IconSize.Menu;
- crpButton.IconId = Gtk.Stock.Refresh;
+ crpButton.StockSize = (uint) IconSize.Menu;
+ crpButton.IconId = Stock.Refresh;
valueCol.PackStart (crpButton, false);
valueCol.AddAttribute (crpButton, "visible", ValueButtonVisibleCol);
crtValue = new CellRendererText ();
@@ -397,16 +399,16 @@ public void LoadState ()
compact = value;
Pango.FontDescription newFont;
if (compact) {
- newFont = this.Style.FontDescription.Copy ();
+ newFont = Style.FontDescription.Copy ();
newFont.Size = (newFont.Size * 8) / 10;
expCol.Sizing = TreeViewColumnSizing.Autosize;
valueCol.Sizing = TreeViewColumnSizing.Autosize;
valueCol.MaxWidth = 800;
- crpButton.Pixbuf = ImageService.GetPixbuf (Gtk.Stock.Refresh).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
- crpViewer.Pixbuf = ImageService.GetPixbuf (Gtk.Stock.ZoomIn).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
+ crpButton.Pixbuf = ImageService.GetPixbuf (Stock.Refresh).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
+ crpViewer.Pixbuf = ImageService.GetPixbuf (Stock.ZoomIn).ScaleSimple (12, 12, Gdk.InterpType.Hyper);
ColumnsAutosize ();
} else {
- newFont = this.Style.FontDescription;
+ newFont = Style.FontDescription;
expCol.Sizing = TreeViewColumnSizing.Fixed;
valueCol.Sizing = TreeViewColumnSizing.Fixed;
valueCol.MaxWidth = int.MaxValue;
@@ -719,7 +721,7 @@ void SetValues (TreeIter parent, TreeIter it, string name, ObjectValue val)
strval = val.Value;
valueColor = disabledColor;
if (val.CanRefresh)
- valueButton = Gtk.Stock.Refresh;
+ valueButton = Stock.Refresh;
canEdit = false;
}
else if (val.IsEvaluating) {
@@ -905,19 +907,19 @@ string GetIterPath (TreeIter iter)
return sb.ToString ();
}
- void OnExpEditing (object s, Gtk.EditingStartedArgs args)
+ void OnExpEditing (object s, EditingStartedArgs args)
{
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- Gtk.Entry e = (Gtk.Entry) args.Editable;
+ Entry e = (Entry) args.Editable;
if (e.Text == createMsg)
e.Text = string.Empty;
OnStartEditing (args);
}
- void OnExpEdited (object s, Gtk.EditedArgs args)
+ void OnExpEdited (object s, EditedArgs args)
{
OnEndEditing ();
@@ -950,13 +952,13 @@ void OnExpEdited (object s, Gtk.EditedArgs args)
bool editing;
- void OnValueEditing (object s, Gtk.EditingStartedArgs args)
+ void OnValueEditing (object s, EditingStartedArgs args)
{
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- var entry = (Gtk.Entry) args.Editable;
+ var entry = (Entry) args.Editable;
ObjectValue val = store.GetValue (it, ObjectCol) as ObjectValue;
string strVal = val != null ? val.Value : null;
@@ -967,14 +969,16 @@ void OnValueEditing (object s, Gtk.EditingStartedArgs args)
OnStartEditing (args);
}
- void OnValueEdited (object s, Gtk.EditedArgs args)
+ void OnValueEdited (object s, EditedArgs args)
{
OnEndEditing ();
TreeIter it;
if (!store.GetIterFromString (out it, args.Path))
return;
- ObjectValue val = store.GetValue (it, ObjectCol) as ObjectValue;
+
+ ObjectValue val = (ObjectValue) store.GetValue (it, ObjectCol);
+
try {
string newVal = args.NewText;
/* if (newVal == null) {
@@ -986,6 +990,7 @@ void OnValueEdited (object s, Gtk.EditedArgs args)
} catch (Exception ex) {
LoggingService.LogError ("Could not set value for object '" + val.Name + "'", ex);
}
+
store.SetValue (it, ValueCol, val.DisplayValue);
// Update the color
@@ -1008,10 +1013,10 @@ void OnEditingCancelled (object s, EventArgs args)
OnEndEditing ();
}
- void OnStartEditing (Gtk.EditingStartedArgs args)
+ void OnStartEditing (EditingStartedArgs args)
{
editing = true;
- editEntry = (Gtk.Entry) args.Editable;
+ editEntry = (Entry) args.Editable;
editEntry.KeyPressEvent += OnEditKeyPress;
editEntry.KeyReleaseEvent += OnEditKeyRelease;
if (StartEditing != null)
@@ -1048,7 +1053,7 @@ void OnEditKeyRelease (object sender, EventArgs e)
uint keyValue;
[GLib.ConnectBeforeAttribute]
- void OnEditKeyPress (object s, Gtk.KeyPressEventArgs args)
+ void OnEditKeyPress (object s, KeyPressEventArgs args)
{
wasHandled = false;
key = args.Event.Key;
@@ -1069,7 +1074,7 @@ static bool IsCompletionChar (char c)
void PopupCompletion (Entry entry)
{
- Gtk.Application.Invoke (delegate {
+ Application.Invoke (delegate {
char c = (char)Gdk.Keyval.ToUnicode (keyValue);
if (currentCompletionData == null && IsCompletionChar (c)) {
string exp = entry.Text.Substring (0, entry.CursorPosition);
@@ -1297,10 +1302,10 @@ protected void OnCopy ()
return;
if (selected.Length == 1) {
- object focus = IdeApp.Workbench.RootWindow.Focus;
+ var editable = IdeApp.Workbench.RootWindow.Focus as Editable;
- if (focus is Gtk.Editable) {
- ((Gtk.Editable) focus).CopyClipboard ();
+ if (editable != null) {
+ editable.CopyClipboard ();
return;
}
}
@@ -1524,7 +1529,8 @@ public void RemovePinnedWatch (TreeIter it)
protected virtual void OnCompletionContextChanged (EventArgs e)
{
- EventHandler handler = this.CompletionContextChanged;
+ var handler = CompletionContextChanged;
+
if (handler != null)
handler (this, e);
}
@@ -1559,9 +1565,9 @@ char ICompletionWidget.GetChar (int offset)
{
string txt = editEntry.Text;
if (offset >= txt.Length)
- return (char)0;
- else
- return txt [offset];
+ return '\0';
+
+ return txt [offset];
}
CodeCompletionContext ICompletionWidget.CreateCodeCompletionContext (int triggerOffset)
@@ -1711,12 +1717,14 @@ public DebugCompletionDataList (Mono.Debugging.Client.CompletionData data)
get;
set;
}
- static List<ICompletionKeyHandler> keyHandler = new List<ICompletionKeyHandler> ();
+
+ static readonly List<ICompletionKeyHandler> keyHandler = new List<ICompletionKeyHandler> ();
public IEnumerable<ICompletionKeyHandler> KeyHandler { get { return keyHandler;} }
public void OnCompletionListClosed (EventArgs e)
{
- EventHandler handler = this.CompletionListClosed;
+ var handler = CompletionListClosed;
+
if (handler != null)
handler (this, e);
}
@@ -1726,7 +1734,7 @@ public void OnCompletionListClosed (EventArgs e)
class DebugCompletionData : MonoDevelop.Ide.CodeCompletion.CompletionData
{
- CompletionItem item;
+ readonly CompletionItem item;
public DebugCompletionData (CompletionItem item)
{
Modified: main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.ExceptionCaughtWidget.cs
===================================================================
@@ -73,8 +73,6 @@ protected virtual void Build ()
this.hbox2.Add (this.vboxExceptionInfo);
global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vboxExceptionInfo]));
w4.Position = 1;
- w4.Expand = false;
- w4.Fill = false;
this.vbox2.Add (this.hbox2);
global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox2]));
w5.Position = 0;
Modified: main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
===================================================================
@@ -1820,9 +1820,7 @@ Break when the hit count is a multiple of</property>
</widget>
<packing>
<property name="Position">1</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
+ <property name="AutoSize">False</property>
</packing>
</child>
</widget>
Modified: main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/GtkSpell.cs
===================================================================
@@ -36,22 +36,23 @@ namespace MonoDevelop.Gettext.Editor
// as GtkSpell sharp looks quite old and unmaintained, here is simple wrapper
static class GtkSpell
{
+ const string LIBGTKSPELL = "libgtkspell";
static bool isSupported;
#region Native methods
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtkspell_new_attach (IntPtr textView, string locale, IntPtr error);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern void gtkspell_detach (IntPtr ptr);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern void gtkspell_recheck_all (IntPtr ptr);
- [DllImport ("libgtkspell", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTKSPELL, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtkspell_get_from_text_view (IntPtr textView);
-// [DllImport ("libgtkspell")]
+// [DllImport (LIBGTKSPELL)]
// static extern bool gtkspell_set_language (IntPtr spell, string lang, IntPtr error);
#endregion
Modified: main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextTool.cs
===================================================================
@@ -42,7 +42,7 @@ class GettextTool: IApplication
public int Run (string[] arguments)
{
- Console.WriteLine ("MonoDevelop Gettext Update Tool");
+ Console.WriteLine (BrandingService.BrandApplicationName ("MonoDevelop Gettext Update Tool"));
foreach (string s in arguments)
ReadArgument (s);
Modified: main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = ""
description = "Provides support for visual design of GTK# windows, dialogs and widgets."
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="libstetic.dll"/>
@@ -17,9 +17,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">
Modified: main/src/addins/MonoDevelop.GtkCore/libstetic/GladeUtils.cs
===================================================================
@@ -11,6 +11,9 @@ namespace Stetic {
public static class GladeUtils {
public const string Glade20SystemId = "http://glade.gnome.org/glade-2.0.dtd";
+ const string LIBGOBJ = "libgobject-2.0-0.dll";
+ const string LIBGLIBGLUE = "glibsharpglue-2";
+ const string LIBGTK = "libgtk-win32-2.0-0.dll";
static Gdk.Atom gladeAtom;
public static Gdk.Atom ApplicationXGladeAtom {
@@ -749,40 +752,40 @@ static public void GetSignals (ObjectWrapper wrapper, XmlElement parent_elem)
}
}
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_fundamental (IntPtr gtype);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_ref (IntPtr gtype);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_unref (IntPtr klass);
- [DllImport ("glibsharpglue-2", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGLIBGLUE, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_object_sink (IntPtr raw);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_object_get_property (IntPtr obj, string name, ref GLib.Value val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_object_set_property (IntPtr obj, string name, ref GLib.Value val);
- [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGTK, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_container_child_get_property (IntPtr parent, IntPtr child, string name, ref GLib.Value val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_enum_get_value_by_name (IntPtr enum_class, string name);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_enum_get_value (IntPtr enum_class, int val);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_flags_get_value_by_name (IntPtr flags_class, string nick);
- [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_flags_get_first_value (IntPtr flags_class, uint val);
}
}
Modified: main/src/addins/MonoDevelop.GtkCore/libstetic/ParamSpec.cs
===================================================================
@@ -7,6 +7,7 @@
namespace Stetic {
public class ParamSpec : IDisposable {
+ const string LIBGOBJ = "libgobject-2.0-0.dll";
IntPtr _obj;
public ParamSpec (IntPtr raw)
@@ -199,31 +200,31 @@ public static ParamSpec LookupChildProperty (Type type, string name)
return pspec;
}
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_ref (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_unref (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern void g_param_spec_sink (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_name (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_nick (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_param_spec_get_blurb (IntPtr obj);
- [DllImport("libgobject-2.0-0.dll", CallingConvention=CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention=CallingConvention.Cdecl)]
static extern bool g_param_value_defaults (IntPtr obj, ref GLib.Value value);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_type_class_ref (IntPtr gtype);
- [DllImport("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport(LIBGOBJ, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_object_class_find_property (IntPtr klass, string name);
[DllImport("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
Modified: main/src/addins/MonoDevelop.GtkCore/libsteticui/Metacity/Preview.cs
===================================================================
@@ -10,6 +10,7 @@ namespace Stetic.Metacity {
internal class Preview : Gtk.Bin
{
+ const string LIBMETACITY = "libmetacity-private.so.0";
static Theme theme;
public static bool ThemeError = false;
@@ -123,7 +124,7 @@ static Theme GetTheme ()
protected Preview(GLib.GType gtype) : base(gtype) {}
public Preview(IntPtr raw) : base(raw) {}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_new();
public Preview () : base (IntPtr.Zero)
@@ -135,7 +136,7 @@ public Preview () : base (IntPtr.Zero)
Raw = meta_preview_new();
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_title(IntPtr raw, IntPtr title);
public string Title {
@@ -146,7 +147,7 @@ public Preview () : base (IntPtr.Zero)
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_button_layout(IntPtr raw, ref Stetic.Metacity.ButtonLayout button_layout);
public Stetic.Metacity.ButtonLayout ButtonLayout
@@ -156,7 +157,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_theme(IntPtr raw, IntPtr theme);
public Metacity.Theme Theme {
@@ -165,7 +166,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_mini_icon();
public static Gdk.Pixbuf MiniIcon {
@@ -176,7 +177,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_icon();
public static Gdk.Pixbuf Icon {
@@ -187,7 +188,7 @@ public Stetic.Metacity.ButtonLayout ButtonLayout
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_frame_type(IntPtr raw, int type);
public Stetic.Metacity.FrameType FrameType
@@ -197,7 +198,7 @@ public Stetic.Metacity.FrameType FrameType
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern IntPtr meta_preview_get_type();
public static new GLib.GType GType {
@@ -208,7 +209,7 @@ public Stetic.Metacity.FrameType FrameType
}
}
- [DllImport("libmetacity-private.so.0")]
+ [DllImport(LIBMETACITY)]
static extern void meta_preview_set_frame_flags(IntPtr raw, int flags);
public Stetic.Metacity.FrameFlags FrameFlags
Modified: main/src/addins/MonoDevelop.GtkCore/libsteticui/Windows/WindowsTheme.cs
===================================================================
@@ -7,6 +7,11 @@ namespace Stetic.Windows
{
class WindowsTheme
{
+ const string USER32 = "user32.dll";
+ const string GDI32 = "gdi32.dll";
+ const string LIBGDK = "libgdk-win32-2.0-0.dll";
+ const string UXTHEME = "uxtheme";
+ const string LIBUXTHEME = "uxtheme.dll";
IntPtr hWnd;
IntPtr hTheme;
@@ -83,56 +88,56 @@ public Gdk.Rectangle GetWindowClientArea (Gdk.Rectangle allocation)
const int DT_SINGLELINE = 0x20;
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 DrawThemeBackground (IntPtr hTheme, IntPtr hdc, int iPartId,
int iStateId, ref RECT pRect, ref RECT pClipRect);
- [DllImport ("uxtheme.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (LIBUXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
static extern IntPtr OpenThemeData (IntPtr hWnd, String classList);
- [DllImport ("uxtheme.dll", ExactSpelling = true)]
+ [DllImport (LIBUXTHEME, ExactSpelling = true)]
extern static Int32 CloseThemeData (IntPtr hTheme);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemePartSize (IntPtr hTheme, IntPtr hdc, int part, int state, ref RECT pRect, int eSize, out SIZE size);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemeBackgroundExtent (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pBoundingRect, out RECT pContentRect);
- [DllImport ("uxtheme", ExactSpelling = true)]
+ [DllImport (UXTHEME, ExactSpelling = true)]
extern static Int32 GetThemeMargins (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, int iPropId, out MARGINS pMargins);
- [DllImport ("uxtheme", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
extern static Int32 DrawThemeText (IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, String text, int textLength, UInt32 textFlags, UInt32 textFlags2, ref RECT pRect);
- [DllImport ("uxtheme", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ [DllImport (UXTHEME, ExactSpelling = true, CharSet = CharSet.Unicode)]
extern static Int32 GetThemeSysFont (IntPtr hTheme, int iFontId, ref LOGFONT plf);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern IntPtr CreateFontIndirect ([In] ref LOGFONT lplf);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern int SetBkMode (IntPtr hdc, int iBkMode);
- [DllImport ("gdi32.dll", ExactSpelling = true, PreserveSig = true, SetLastError = true)]
+ [DllImport (GDI32, ExactSpelling = true, PreserveSig = true, SetLastError = true)]
static extern IntPtr SelectObject (IntPtr hdc, IntPtr hgdiobj);
- [DllImport ("gdi32.dll")]
+ [DllImport (GDI32)]
static extern bool DeleteObject (IntPtr hObject);
- [DllImport ("user32.dll")]
+ [DllImport (USER32)]
static extern IntPtr GetDC (IntPtr hWnd);
- [DllImport ("user32.dll")]
+ [DllImport (USER32)]
static extern int ReleaseDC (IntPtr hWnd, IntPtr hDC);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_drawable_get_handle (IntPtr raw);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_win32_hdc_get (IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport (LIBGDK, CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_win32_hdc_release (IntPtr drawable, IntPtr gc, int usage);
}
Modified: main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
===================================================================
@@ -6,7 +6,7 @@
url = ""
description = "Experimental GTK# visual designer developed during GSOC 2010 as a fork of stetic"
category = "IDE extensions"
- version = "4.1.13">
+ version = "4.2">
<Runtime>
<Import assembly="libstetic2.dll"/>
@@ -17,11 +17,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="XmlEditor" version="4.1.13"/>
- <Addin id="Refactoring" version="4.1.13"/>
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="XmlEditor" version="4.2"/>
+ <Addin id="Refactoring" version="4.2"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">
Modified: main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
===================================================================
@@ -6,14 +6,14 @@
url = "http://www.monodevelop.com/"
description = "Support for editing, compiling, and running Moonlight/Silverlight projects."
category = "Web Development"
- version = "4.1.13">
+ version = "4.2">
<Dependencies>
- <Addin id="Core" version="4.1.13"/>
- <Addin id="Ide" version="4.1.13"/>
- <Addin id="DesignerSupport" version="4.1.13"/>
- <Addin id="Deployment" version="4.1.13"/>
- <Addin id="AspNet" version="4.1.13" />
+ <Addin id="Core" version="4.2"/>
+ <Addin id="Ide" version="4.2"/>
+ <Addin id="DesignerSupport" version="4.2"/>
+ <Addin id="Deployment" version="4.2"/>
+ <Addin id="AspNet" version="4.2" />
</Dependencies>
<Runtime>
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
===================================================================
@@ -57,7 +57,7 @@ static IEnumerable<BaseCodeIssueProvider> EnumerateProvider (CodeIssueProvider p
public static IEnumerable<Result> Check (Document input, CancellationToken cancellationToken)
{
- if (!QuickTaskStrip.EnableFancyFeatures || input.Project == null)
+ if (!QuickTaskStrip.EnableFancyFeatures || input.Project == null || !input.IsCompileableInProject)
return Enumerable.Empty<Result> ();
#if PROFILE
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeIssuePad.cs
===================================================================
@@ -78,7 +78,9 @@ public class CodeIssuePadControl : VBox
static readonly Type[] groupingProviders = {
typeof(CategoryGroupingProvider),
typeof(ProviderGroupingProvider),
- typeof(SeverityGroupingProvider)
+ typeof(SeverityGroupingProvider),
+ typeof(ProjectGroupingProvider),
+ typeof(FileGroupingProvider)
};
public CodeIssuePadControl ()
Added: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/FileGroupingProvider.cs
===================================================================
@@ -0,0 +1,46 @@
+//
+// FileGroupingProvider.cs
+//
+// Author:
+// Marius Ungureanu <[email protected]>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Projects;
+using MonoDevelop.Core;
+
+namespace MonoDevelop.CodeIssues
+{
+ [GroupingDescription("File")]
+ public class FileGroupingProvider : AbstractGroupingProvider<ProjectFile>
+ {
+ #region implemented abstract members of AbstractGroupingProvider
+ protected override ProjectFile GetGroupingKey (IssueSummary issue)
+ {
+ return issue.File;
+ }
+ protected override string GetGroupName (IssueSummary issue)
+ {
+ return issue.File.FilePath.ToRelative (issue.Project.BaseDirectory);
+ }
+ #endregion
+ }
+}
+
Added: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/ProjectGroupingProvider.cs
===================================================================
@@ -0,0 +1,45 @@
+//
+// ProjectGroupingProvider.cs
+//
+// Author:
+// Marius Ungureanu <[email protected]>
+//
+// Copyright (c) 2013 Marius Ungureanu
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.CodeIssues
+{
+ [GroupingDescription("Project")]
+ public class ProjectGroupingProvider : AbstractGroupingProvider<Project>
+ {
+ #region implemented abstract members of AbstractGroupingProvider
+ protected override Project GetGroupingKey (IssueSummary issue)
+ {
+ return issue.Project;
+ }
+ protected override string GetGroupName (IssueSummary issue)
+ {
+ return issue.Project.Name;
+ }
+ #endregion
+ }
+}
+
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
===================================================================
@@ -19,8 +19,8 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Refactoring\MonoDevelop.Refactoring.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -30,8 +30,8 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Refactoring\MonoDevelop.Refactoring.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -152,6 +152,8 @@
<Compile Include="MonoDevelop.CodeIssues\Runner\IJobContext.cs" />
<Compile Include="MonoDevelop.CodeIssues\Runner\JobSlice.cs" />
<Compile Include="MonoDevelop.CodeIssues\Runner\JobStatus.cs" />
+ <Compile Include="MonoDevelop.CodeIssues\ProjectGroupingProvider.cs" />
+ <Compile Include="MonoDevelop.CodeIssues\FileGroupingProvider.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="MonoDevelop.Refactoring\" />
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/MessageBubbleCache.cs
===================================================================
@@ -58,8 +58,8 @@ public MessageBubbleCache (TextEditor editor)
warningPixbuf = ImageService.GetIcon ("md-bubble-warning", Gtk.IconSize.Menu);
editor.EditorOptionsChanged += HandleEditorEditorOptionsChanged;
- editor.LeaveNotifyEvent += HandleLeaveNotifyEvent;
- editor.MotionNotifyEvent += HandleMotionNotifyEvent;
+ editor.TextArea.LeaveNotifyEvent += HandleLeaveNotifyEvent;
+ editor.TextArea.MotionNotifyEvent += HandleMotionNotifyEvent;
editor.TextArea.BeginHover += HandleBeginHover;
editor.VAdjustment.ValueChanged += HandleValueChanged;
editor.HAdjustment.ValueChanged += HandleValueChanged;
@@ -288,8 +288,8 @@ public void Dispose ()
editor.VAdjustment.ValueChanged -= HandleValueChanged;