Branch: refs/heads/retina
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/96952b839b0f...9864e98f20f7
Commit: 77610dd527534ab8b2c801ccb48bde242e3ec1bf
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-14 08:14:22 GMT
URL: https://github.com/mono/monodevelop/commit/77610dd527534ab8b2c801ccb48bde242e3ec1bf
Fixed 'Bug 13989 - Importable symbols selected before imported
symbols'.
Changed paths:
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
===================================================================
@@ -1111,6 +1111,7 @@ public ImportSymbolCompletionData (CSharpCompletionTextEditorExtension ext, bool
this.ext = ext;
this.useFullName = useFullName;
this.type = type;
+ this.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.IsImportCompletion;
}
public override TooltipInformation CreateTooltipInformation (bool smartWrap)
@@ -1194,10 +1195,7 @@ public override string GetDisplayDescription (bool isSelected)
public override string Description {
get {
- Initialize ();
- if (generateUsing)
- return type.Namespace;
- return null;
+ return type.Namespace;
}
}
@@ -1208,19 +1206,6 @@ public override string GetDisplayDescription (bool isSelected)
}
#endregion
- public override int CompareTo (object obj)
- {
- var result = base.CompareTo (obj);
- if (result == 0) {
- var isd = obj as ImportSymbolCompletionData;
- if (isd != null) {
- result = StringComparer.OrdinalIgnoreCase.Compare (Description, isd.Description);
- } else {
- return 1;
- }
- }
- return result;
- }
List<CompletionData> overloads;
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/ImportSymbolHandler.cs
===================================================================
@@ -111,6 +111,7 @@ public ImportSymbolCompletionData (MonoDevelop.Ide.Gui.Document doc, ImportSymbo
this.ambience = AmbienceService.GetAmbience (doc.Editor.MimeType);
this.type = type;
this.unit = doc.ParsedDocument;
+ this.DisplayFlags |= ICSharpCode.NRefactory.Completion.DisplayFlags.IsImportCompletion;
}
bool initialized = false;
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionData.cs
===================================================================
@@ -126,9 +126,17 @@ public virtual int CompareTo (object obj)
public static int Compare (ICompletionData a, ICompletionData b)
{
- var result = ((a.DisplayFlags & DisplayFlags.Obsolete) == (b.DisplayFlags & DisplayFlags.Obsolete))
- ? StringComparer.OrdinalIgnoreCase.Compare (a.DisplayText, b.DisplayText)
- : (a.DisplayFlags & DisplayFlags.Obsolete) != 0 ? 1 : -1;
+ var result = ((a.DisplayFlags & DisplayFlags.Obsolete) == (b.DisplayFlags & DisplayFlags.Obsolete)) ? StringComparer.OrdinalIgnoreCase.Compare (a.DisplayText, b.DisplayText) : (a.DisplayFlags & DisplayFlags.Obsolete) != 0 ? 1 : -1;
+ if (result == 0) {
+ var aIsImport = (a.DisplayFlags & DisplayFlags.IsImportCompletion) != 0;
+ var bIsImport = (b.DisplayFlags & DisplayFlags.IsImportCompletion) != 0;
+ if (!aIsImport && bIsImport)
+ return -1;
+ if (aIsImport && !bIsImport)
+ return 1;
+ if (aIsImport && bIsImport)
+ return StringComparer.Ordinal.Compare (a.Description, b.Description);
+ }
return result;
}
Commit: f6912214881e503a7b817a50376500024587408a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-14 08:26:46 GMT
URL: https://github.com/mono/monodevelop/commit/f6912214881e503a7b817a50376500024587408a
Fixed 'Bug 15303 - Redundant cast false positive'.
Changed paths:
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.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)
+ if (!QuickTaskStrip.EnableFancyFeatures || input.Project == null)
return Enumerable.Empty<Result> ();
#if PROFILE
Commit: a28e82d46f0277074f4d8b85de43beb8f57ff8a4
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-14 08:26:46 GMT
URL: https://github.com/mono/monodevelop/commit/a28e82d46f0277074f4d8b85de43beb8f57ff8a4
Fixed mixed line ending detection.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor/Document/LineSplitter.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Document/LineSplitter.cs
===================================================================
@@ -154,8 +154,11 @@ public void Initalize (string text)
int delimiterEndOffset = delimiter.Offset + delimiter.Length;
var newLine = new TreeNode (delimiterEndOffset - offset, delimiter.Length);
nodes.Add (newLine);
- if (offset > 0 && delimiterType != delimiter.UnicodeNewline)
- LineEndingMismatch = true;
+ if (offset > 0) {
+ LineEndingMismatch |= delimiterType != delimiter.UnicodeNewline;
+ } else {
+ delimiterType = delimiter.UnicodeNewline;
+ }
offset = delimiterEndOffset;
}
var lastLine = new TreeNode (text.Length - offset, 0);
Commit: b970f4a86dd1e7a7a8310beff0a77de28cc664b8
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-14 08:40:17 GMT
URL: https://github.com/mono/monodevelop/commit/b970f4a86dd1e7a7a8310beff0a77de28cc664b8
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 37f7f49e89db32b4fa5eab0a6a7bdea54154e313
+Subproject commit d64bfb90310d07548a917ec05929e5e3555ff19d
Commit: d0926115623cb23d21c57c402c52ac3628a967f6
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-14 12:37:20 GMT
URL: https://github.com/mono/monodevelop/commit/d0926115623cb23d21c57c402c52ac3628a967f6
Fixed 'Bug 14898 - Cant edit no any highlight scheme'.
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/ColorShemeEditor.cs
===================================================================
@@ -242,7 +242,7 @@ public void SetSheme (ColorScheme style)
{
if (style == null)
throw new ArgumentNullException ("style");
- this.fileName = Mono.TextEditor.Highlighting.SyntaxModeService.GetFileNameForStyle (style);
+ this.fileName = style.FileName;
this.colorSheme = style;
this.entryName.Text = style.Name;
this.entryDescription.Text = style.Description;
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
===================================================================
@@ -99,7 +99,7 @@ void HandleStyleTreeviewSelectionChanged (object sender, EventArgs e)
if (sheme == null)
return;
this.buttonExport.Sensitive = true;
- string fileName = Mono.TextEditor.Highlighting.SyntaxModeService.GetFileNameForStyle (sheme);
+ string fileName = sheme.FileName;
if (fileName == null)
return;
this.removeButton.Sensitive = true;
@@ -111,7 +111,8 @@ void HandleButtonEdithandleClicked (object sender, EventArgs e)
TreeIter selectedIter;
if (styleTreeview.Selection.GetSelected (out selectedIter)) {
var editor = new ColorShemeEditor (this);
- editor.SetSheme ((Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1));
+ var colorScheme = (Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1);
+ editor.SetSheme (colorScheme);
MessageService.RunCustomDialog (editor, dialog);
editor.Destroy ();
}
@@ -140,7 +141,7 @@ internal void ShowStyles ()
string name = style.Name ?? "";
string description = style.Description ?? "";
// translate only build-in sheme names
- if (string.IsNullOrEmpty (Mono.TextEditor.Highlighting.SyntaxModeService.GetFileNameForStyle (style))) {
+ if (string.IsNullOrEmpty (style.FileName)) {
try {
name = GettextCatalog.GetString (name);
if (!string.IsNullOrEmpty (description))
@@ -160,11 +161,11 @@ void RemoveColorScheme (object sender, EventArgs args)
TreeIter selectedIter;
if (!styleTreeview.Selection.GetSelected (out selectedIter))
return;
- var sheme = (Mono.TextEditor.Highlighting.ColorScheme)this.styleStore.GetValue (selectedIter, 1);
+ var sheme = (ColorScheme)this.styleStore.GetValue (selectedIter, 1);
- string fileName = Mono.TextEditor.Highlighting.SyntaxModeService.GetFileNameForStyle (sheme);
+ string fileName = sheme.FileName;
- if (fileName != null && fileName.StartsWith (SourceEditorDisplayBinding.SyntaxModePath)) {
+ if (fileName != null && fileName.StartsWith (SourceEditorDisplayBinding.SyntaxModePath, StringComparison.Ordinal)) {
Mono.TextEditor.Highlighting.SyntaxModeService.Remove (sheme);
File.Delete (fileName);
ShowStyles ();
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/NewColorShemeDialog.cs
===================================================================
@@ -76,7 +76,8 @@ void HandleButtonOkClicked (object sender, EventArgs e)
string fileName = System.IO.Path.Combine (path, baseName + "Style.json");
try {
style.Save (fileName);
- Mono.TextEditor.Highlighting.SyntaxModeService.AddStyle (fileName, style);
+ style.FileName = fileName;
+ Mono.TextEditor.Highlighting.SyntaxModeService.AddStyle (style);
} catch (Exception ex) {
MonoDevelop.Ide.MessageService.ShowException (ex);
}
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
===================================================================
@@ -42,6 +42,7 @@ public class ColorScheme
public string Description { get; set; }
public string Originator { get; set; }
public string BaseScheme { get; set; }
+ public string FileName { get; set; }
#region Ambient Colors
[ColorDescription("Background(Read Only)",VSSetting="color=Plain Text/Background")]
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxModeService.cs
===================================================================
@@ -43,8 +43,7 @@ public static class SyntaxModeService
static Dictionary<string, ColorScheme> styles = new Dictionary<string, ColorScheme> ();
static Dictionary<string, IStreamProvider> syntaxModeLookup = new Dictionary<string, IStreamProvider> ();
static Dictionary<string, IStreamProvider> styleLookup = new Dictionary<string, IStreamProvider> ();
- static Dictionary<string, string> isLoadedFromFile = new Dictionary<string, string> ();
-
+
public static string[] Styles {
get {
List<string> result = new List<string> ();
@@ -60,14 +59,6 @@ public static class SyntaxModeService
}
}
- public static string GetFileNameForStyle (ColorScheme style)
- {
- string result;
- if (!isLoadedFromFile.TryGetValue (style.Name, out result))
- return null;
- return result;
- }
-
public static void InstallSyntaxMode (string mimeType, ISyntaxModeProvider modeProvider)
{
if (syntaxModeLookup.ContainsKey (mimeType))
@@ -107,6 +98,7 @@ static void LoadStyle (string name)
if (!styleLookup.ContainsKey (name))
throw new System.ArgumentException ("Style " + name + " not found", "name");
var provider = styleLookup [name];
+ styleLookup.Remove (name);
var stream = provider.Open ();
try {
if (provider is UrlStreamProvider) {
@@ -116,6 +108,7 @@ static void LoadStyle (string name)
} else {
styles [name] = ColorScheme.LoadFrom (stream);
}
+ styles [name].FileName = usp.Url;
} else {
styles [name] = ColorScheme.LoadFrom (stream);
}
@@ -196,10 +189,15 @@ public static bool ValidateAllSyntaxModes ()
public static void Remove (ColorScheme style)
{
- if (styles.ContainsKey (style.Name))
- styles.Remove (style.Name);
if (styleLookup.ContainsKey (style.Name))
styleLookup.Remove (style.Name);
+
+ foreach (var kv in styles) {
+ if (kv.Value == style) {
+ styles.Remove (kv.Key);
+ return;
+ }
+ }
}
public static void Remove (SyntaxMode mode)
@@ -427,7 +425,6 @@ public static void LoadStylesAndModes (string path)
string styleName = ScanStyle (stream);
if (!string.IsNullOrEmpty (styleName)) {
styleLookup [styleName] = new UrlStreamProvider (file);
- isLoadedFromFile [styleName] = file;
} else {
Console.WriteLine ("Invalid .json syntax sheme file : " + file);
}
@@ -436,7 +433,6 @@ public static void LoadStylesAndModes (string path)
using (var stream = File.OpenRead (file)) {
string styleName = Path.GetFileNameWithoutExtension (file);
styleLookup [styleName] = new UrlStreamProvider (file);
- isLoadedFromFile [styleName] = file;
}
}
}
@@ -500,9 +496,8 @@ public static void RemoveSyntaxMode (IStreamProvider provider)
}
}
- public static void AddStyle (string fileName, ColorScheme style)
+ public static void AddStyle (ColorScheme style)
{
- isLoadedFromFile [style.Name] = fileName;
styles [style.Name] = style;
}
Commit: bf3804fa212cda070156e08e4248c171b39351d0
Author: Jérémie Laval <[email protected]> (garuma)
Date: 2013-10-14 18:54:29 GMT
URL: https://github.com/mono/monodevelop/commit/bf3804fa212cda070156e08e4248c171b39351d0
[build] Bump monomac for ios api doc fixes
Changed paths:
M main/external/monomac
Modified: main/external/monomac
===================================================================
@@ -1 +1 @@
-Subproject commit 6ba8ba62e3d07de3bc28b268a18b47193041277f
+Subproject commit 4c4af435a802a4b4b569d4a29156d8da68f906d4
Commit: e188e2d50f15ba930b882bf5f60cd5447f703aa2
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-14 19:53:18 GMT
URL: https://github.com/mono/monodevelop/commit/e188e2d50f15ba930b882bf5f60cd5447f703aa2
[TextEditor] Set the background color of the scrolled window as a hint to
gtk+ to determine the brightness so it can use either dark or light overlay
scrollbars on Mac. See bockbuild a5941db3f400834df90bf6c2f312da0a100aeecf
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=15257
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs
===================================================================
@@ -667,6 +667,8 @@ protected override void OnRealized ()
imContext.ClientWindow = this.GdkWindow;
Caret.PositionChanged += CaretPositionChanged;
+
+ SetWidgetBgFromStyle ();
}
protected override void OnUnrealized ()
@@ -721,6 +723,15 @@ void SetWidgetBgFromStyle ()
// when the bg color is differs from the color style bg color (e.g. oblivion style)
if (this.textEditorData.ColorStyle != null && GdkWindow != null) {
settingWidgetBg = true; //prevent infinite recusion
+
+ Widget parent = this;
+ while (parent.Parent != null && !(parent is ScrolledWindow)) {
+ parent = parent.Parent;
+ }
+
+ if (parent != null) {
+ parent.ModifyBg (StateType.Normal, (HslColor)this.textEditorData.ColorStyle.PlainText.Background);
+ }
this.ModifyBg (StateType.Normal, (HslColor)this.textEditorData.ColorStyle.PlainText.Background);
settingWidgetBg = false;
@@ -732,7 +743,6 @@ protected override void OnStyleSet (Gtk.Style previous_style)
{
base.OnStyleSet (previous_style);
if (!settingWidgetBg && textEditorData.ColorStyle != null) {
-// textEditorData.ColorStyle.UpdateFromGtkStyle (this.Style);
SetWidgetBgFromStyle ();
}
}
Commit: 6f5cefb49ec86ceb422bf626be518c6aa291c91d
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-14 20:53:00 GMT
URL: https://github.com/mono/monodevelop/commit/6f5cefb49ec86ceb422bf626be518c6aa291c91d
[Core] Report Raygun errors from a background thread instead of the UI thread.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -193,7 +193,9 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown,
}
if (raygunClient != null) {
- raygunClient.Send (ex, tags);
+ ThreadPool.QueueUserWorkItem (delegate {
+ raygunClient.Send (ex, tags);
+ });
}
// Log to disk only if uploading fails.
Commit: c9d293915c9081e7ad4deac855f17976557156cb
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-15 04:56:15 GMT
URL: https://github.com/mono/monodevelop/commit/c9d293915c9081e7ad4deac855f17976557156cb
Fixed 'Bug 15388 - Create new console project, no completion +
deadlock when closing project'
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService.cs
===================================================================
@@ -1674,7 +1674,7 @@ static void OnProjectModified (object sender, SolutionItemModifiedEventArgs args
#endregion
- public static void Unload (WorkspaceItem item)
+ internal static void Unload (WorkspaceItem item)
{
var ws = item as Workspace;
if (ws != null) {
@@ -1696,23 +1696,23 @@ public static void Unload (WorkspaceItem item)
}
}
- public static void UnloadProject (Project project)
+ internal static void UnloadProject (Project project)
{
- lock (projectWrapperUpdateLock) {
- if (DecLoadCount (project) != 0)
- return;
- Counters.ParserService.ProjectsLoaded--;
- project.FileAddedToProject -= OnFileAdded;
- project.FileRemovedFromProject -= OnFileRemoved;
- project.FileRenamedInProject -= OnFileRenamed;
- project.Modified -= OnProjectModified;
+ if (DecLoadCount (project) != 0)
+ return;
+ Counters.ParserService.ProjectsLoaded--;
+ project.FileAddedToProject -= OnFileAdded;
+ project.FileRemovedFromProject -= OnFileRemoved;
+ project.FileRenamedInProject -= OnFileRenamed;
+ project.Modified -= OnProjectModified;
- var wrapper = projectContents [project];
+ ProjectContentWrapper wrapper;
+ lock (projectWrapperUpdateLock) {
+ wrapper = projectContents [project];
projectContents.Remove (project);
-
- StoreProjectCache (project, wrapper);
- OnProjectUnloaded (new ProjectUnloadEventArgs (project, wrapper));
}
+ StoreProjectCache (project, wrapper);
+ OnProjectUnloaded (new ProjectUnloadEventArgs (project, wrapper));
}
public static event EventHandler<ProjectUnloadEventArgs> ProjectUnloaded;
@@ -2696,45 +2696,41 @@ static void CheckModifiedFiles (Project project, ProjectFile[] projectFiles, Pro
var modifiedFiles = new List<ProjectFile> ();
var oldFileNewFile = new List<Tuple<ProjectFile, IUnresolvedFile>> ();
- lock (projectWrapperUpdateLock) {
- 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);
- oldFileNewFile.Add (Tuple.Create (file, oldFile));
- }
+ 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);
+ oldFileNewFile.Add (Tuple.Create (file, oldFile));
}
// This is disk intensive and slow
oldFileNewFile.RemoveAll (t => !IsFileModified (t.Item1, t.Item2));
- lock (projectWrapperUpdateLock) {
- 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);
- if (parser == null)
- continue;
- }
- modifiedFiles.Add (file);
+ 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);
+ if (parser == null)
+ continue;
}
- var tags = content.GetExtensionObject <ProjectCommentTags> ();
-
- // check if file needs to be removed from project content
- foreach (var file in cnt.Files) {
- if (project.GetProjectFile (file.FileName) == null) {
- content.UpdateContent (c => c.RemoveFiles (file.FileName));
- content.InformFileRemoved (new ParsedFileEventArgs (file));
- if (tags != null)
- tags.RemoveFile (project, file.FileName);
- }
+ modifiedFiles.Add (file);
+ }
+ var tags = content.GetExtensionObject <ProjectCommentTags> ();
+
+ // check if file needs to be removed from project content
+ foreach (var file in cnt.Files) {
+ if (project.GetProjectFile (file.FileName) == null) {
+ content.UpdateContent (c => c.RemoveFiles (file.FileName));
+ content.InformFileRemoved (new ParsedFileEventArgs (file));
+ if (tags != null)
+ tags.RemoveFile (project, file.FileName);
}
-
- if (modifiedFiles.Count > 0)
- QueueParseJob (content, modifiedFiles);
}
+
+ if (modifiedFiles.Count > 0)
+ QueueParseJob (content, modifiedFiles);
} catch (Exception e) {
LoggingService.LogError ("Exception in check modified files.", e);
} finally {
Commit: a04091eef2c7fce8efe3712f4dead94697b4f15a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-15 05:34:02 GMT
URL: https://github.com/mono/monodevelop/commit/a04091eef2c7fce8efe3712f4dead94697b4f15a
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit d64bfb90310d07548a917ec05929e5e3555ff19d
+Subproject commit 9079c2436a9d462d54fe98fcac4a4609a6e580bb
Commit: 762d7181807229633ed0ba442236976473988711
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-15 06:00:06 GMT
URL: https://github.com/mono/monodevelop/commit/762d7181807229633ed0ba442236976473988711
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 9079c2436a9d462d54fe98fcac4a4609a6e580bb
+Subproject commit 710c0466eec0178929ab22dcd9d0220109021bc2
Commit: 4e63a77545ae486ba8eeb55ab2cb73a608aa4977
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-15 10:06:31 GMT
URL: https://github.com/mono/monodevelop/commit/4e63a77545ae486ba8eeb55ab2cb73a608aa4977
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 710c0466eec0178929ab22dcd9d0220109021bc2
+Subproject commit d5aa75a29108ee38d001e9ce12dd2c958ab221f3
Commit: 9dfdc8b08e4eef2b62c47644149d31731ce4f795
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-15 10:29:22 GMT
URL: https://github.com/mono/monodevelop/commit/9dfdc8b08e4eef2b62c47644149d31731ce4f795
Fixed 'Bug 15233 - Syntax highlighting incorrect in F#'.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
M main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/SyntaxMode.cs
===================================================================
@@ -205,7 +205,6 @@ public class SpanParser
protected Stack<Rule> ruleStack;
protected readonly TextDocument doc;
- internal Func<bool> IsAtWordStart = () => true;
int maxEnd;
public Rule CurRule {
@@ -367,8 +366,11 @@ protected virtual bool ScanSpan (ref int i)
bool mismatch = false;
if ((span.BeginFlags & SpanBeginFlags.FirstNonWs) == SpanBeginFlags.FirstNonWs)
mismatch = CurText.Take (i).Any (ch => !char.IsWhiteSpace (ch));
- if ((span.BeginFlags & SpanBeginFlags.NewWord) == SpanBeginFlags.NewWord)
- mismatch = !IsAtWordStart ();
+ if ((span.BeginFlags & SpanBeginFlags.NewWord) == SpanBeginFlags.NewWord) {
+ if (i - 1 > 0 && i - 1 < CurText.Length) {
+ mismatch = !char.IsWhiteSpace (CurText[i - 1]);
+ }
+ }
if (mismatch)
continue;
FoundSpanBegin (span, i, match.Length);
@@ -463,7 +465,6 @@ public ChunkParser (SyntaxMode mode, SpanParser spanParser, ColorScheme style, D
spanParser.FoundSpanEnd = FoundSpanEnd;
spanParser.FoundSpanExit = FoundSpanExit;
spanParser.ParseChar += ParseChar;
- spanParser.IsAtWordStart = () => wordbuilder.Length == 0;
if (line == null)
throw new ArgumentNullException ("line");
}
Modified: main/src/core/Mono.Texteditor/SyntaxModes/FSharpSyntaxMode.xml
===================================================================
@@ -63,21 +63,16 @@
<End>"""</End>
</Span>
- <Span color="String" rule="String" stopateol="true">
+ <Span color="String" rule="String" stopateol="true" escape='\"'>
<Begin>"</Begin>
<End>"</End>
</Span>
<Span rule="Let" stopateol = "false">
- <Begin color="Keyword(Iteration)" flags="NewWord">let</Begin>
+ <Begin color="Keyword(Iteration)" flags="NewWord">let </Begin>
<End>=</End>
</Span>
- <Span color = "String" rule="String" stopateol = "true">
- <Begin>'</Begin>
- <End>'</End>
- </Span>
-
<!--
<Span color="String" rule="String" stopateol="true" escape='\'>
<Begin>[]</Begin>
@@ -95,6 +90,10 @@
<Group color="String"/>
</Match>
+ <Match color="String">'(\w|\\['ntbrafv])'</Match>
+
+
+
<Match color="Number">CSharpNumber</Match>
<!-- It is really impossible to do some intelligent grouping here, because
Commit: 207ccb79e41d55dd1e23038bac3437ad974bf968
Author: lluis <[email protected]> (slluis)
Date: 2013-10-15 17:06:34 GMT
URL: https://github.com/mono/monodevelop/commit/207ccb79e41d55dd1e23038bac3437ad974bf968
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit c7c2e8c232b1213513fe67e38da33a433e495634
+Subproject commit f3626d7405d977d79aa5b68301273155284cad90
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]=49616da5b5b861a7edbbbfa052ccb77f67b4a805
+DEP_NEEDED_VERSION[0]=f65f2992976b8be63511c249883e1122515371df
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 1d45cf8f4019abb1409cf609652f4696f567999c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-15 17:45:03 GMT
URL: https://github.com/mono/monodevelop/commit/1d45cf8f4019abb1409cf609652f4696f567999c
[UnitTests] fixed failing unit test
Changed paths:
M main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs
Modified: main/tests/UnitTests/MonoDevelop.CSharpBinding/CSharpTextEditorIndentationTests.cs
===================================================================
@@ -369,7 +369,7 @@ public void TestBug15335 ()
var data = Create ("namespace Foo\n{\n\tpublic class Bar\n\t{\n\t\tvoid Test()\r\n\t\t{\r\n\t\t\t/* foo$\n\t\t}\n\t}\n}\n");
MiscActions.InsertNewLine (data);
- CheckOutput (data, "namespace aFoo\n{\n\tpublic class Bar\n\t{\n\t\tvoid Test()\r\n\t\t{\r\n\t\t\t/* foo\n\t\t\t * $\n\t\t}\n\t}\n}\n");
+ CheckOutput (data, "namespace Foo\n{\n\tpublic class Bar\n\t{\n\t\tvoid Test()\r\n\t\t{\r\n\t\t\t/* foo\n\t\t\t * $\n\t\t}\n\t}\n}\n");
}
}
}
Commit: a8f683c04c56d4b75a44dbc70d409dd08a230e7d
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-15 20:01:37 GMT
URL: https://github.com/mono/monodevelop/commit/a8f683c04c56d4b75a44dbc70d409dd08a230e7d
[Core] This should be logging a critical error, not internal.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
===================================================================
@@ -502,7 +502,7 @@ void SetupExceptionManager ()
void HandleException (Exception ex, bool willShutdown)
{
// Log the crash to the MonoDevelop.log file first:
- LoggingService.LogInternalError (string.Format ("An unhandled exception has occured. Terminating MonoDevelop? {0}", willShutdown), ex);
+ LoggingService.LogCriticalError (string.Format ("An unhandled exception has occured. Terminating MonoDevelop? {0}", willShutdown), ex);
}
/// <summary>SDBM-style hash, bounded to a range of 1000.</summary>
Commit: 9b60fbe11a4c3b2438c2f5af8ccaf77252db71a6
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-15 20:07:39 GMT
URL: https://github.com/mono/monodevelop/commit/9b60fbe11a4c3b2438c2f5af8ccaf77252db71a6
[Core] Log critical or fatal depending upon willShutdown.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
===================================================================
@@ -501,8 +501,12 @@ void SetupExceptionManager ()
void HandleException (Exception ex, bool willShutdown)
{
- // Log the crash to the MonoDevelop.log file first:
- LoggingService.LogCriticalError (string.Format ("An unhandled exception has occured. Terminating MonoDevelop? {0}", willShutdown), ex);
+ var msg = String.Format ("An unhandled exception has occured. Terminating MonoDevelop? {0}", willShutdown);
+
+ if (willShutdown)
+ LoggingService.LogFatalError (msg, ex);
+ else
+ LoggingService.LogCriticalError (msg, ex);
}
/// <summary>SDBM-style hash, bounded to a range of 1000.</summary>
Commit: 7884a57b9acb46502dc09b5256dcaa023cfa5787
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-15 23:58:54 GMT
URL: https://github.com/mono/monodevelop/commit/7884a57b9acb46502dc09b5256dcaa023cfa5787
Bump xwt to match md-addins l-s
Changed paths:
M main/external/xwt
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit f3626d7405d977d79aa5b68301273155284cad90
+Subproject commit c0a4f28ba9647460acb7f1474a347f8b53553c94
Commit: 2676ea464f282cea3c1cfb156c0951d6ad1f7c2d
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 04:18:19 GMT
URL: https://github.com/mono/monodevelop/commit/2676ea464f282cea3c1cfb156c0951d6ad1f7c2d
Fixed 'Bug 15415 - Error when SAVING in mono develop'.
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
===================================================================
@@ -645,12 +645,16 @@ public void Save (string fileName, Encoding encoding)
}
if (PropertyService.Get ("AutoFormatDocumentOnSave", false)) {
- var formatter = CodeFormatterService.GetFormatter (Document.MimeType);
- if (formatter != null && formatter.SupportsOnTheFlyFormatting) {
- using (var undo = TextEditor.OpenUndoGroup ()) {
- formatter.OnTheFlyFormat (WorkbenchWindow.Document, 0, Document.TextLength);
- wasEdited = false;
+ try {
+ var formatter = CodeFormatterService.GetFormatter (Document.MimeType);
+ if (formatter != null && formatter.SupportsOnTheFlyFormatting) {
+ using (var undo = TextEditor.OpenUndoGroup ()) {
+ formatter.OnTheFlyFormat (WorkbenchWindow.Document, 0, Document.TextLength);
+ wasEdited = false;
+ }
}
+ } catch (Exception e) {
+ LoggingService.LogError ("Error while formatting on save", e);
}
}
Commit: d0d58072caf91973a0b94e54956e437820b7185a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 04:27:07 GMT
URL: https://github.com/mono/monodevelop/commit/d0d58072caf91973a0b94e54956e437820b7185a
[CSharpBinding] Fixed potential System.InvalidOperationException
Changed paths:
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
===================================================================
@@ -73,9 +73,6 @@ class CSharpSyntaxMode : SyntaxMode, IQuickTaskProvider, IDisposable
{
readonly Document guiDocument;
- SyntaxTree unit;
-// CSharpUnresolvedFile parsedFile;
-// ICompilation compilation;
CSharpAstResolver resolver;
CancellationTokenSource src;
@@ -169,11 +166,9 @@ void HandleDocumentParsed (object sender, EventArgs e)
var newResolver = newResolverTask.Result;
if (newResolver == null)
return;
- unit = newResolver.RootNode as SyntaxTree;
-// parsedFile = newResolver.UnresolvedFile;
var visitor = new QuickTaskVisitor (newResolver, cancellationToken);
try {
- unit.AcceptVisitor (visitor);
+ newResolver.RootNode.AcceptVisitor (visitor);
} catch (Exception ex) {
LoggingService.LogError ("Error while analyzing the file for the semantic highlighting.", ex);
return;
@@ -695,9 +690,10 @@ protected override void AddRealChunk (Chunk chunk)
try {
HighlightingVisitior visitor;
if (!csharpSyntaxMode.lineSegments.TryGetValue (line, out visitor)) {
- visitor = new HighlightingVisitior (csharpSyntaxMode.resolver, default (CancellationToken), lineNumber, base.line.Offset, line.Length);
+ var resolver = csharpSyntaxMode.resolver;
+ visitor = new HighlightingVisitior (resolver, default (CancellationToken), lineNumber, base.line.Offset, line.Length);
visitor.tree.InstallListener (doc);
- csharpSyntaxMode.unit.AcceptVisitor (visitor);
+ resolver.RootNode.AcceptVisitor (visitor);
csharpSyntaxMode.lineSegments[line] = visitor;
}
string style;
Commit: 5c430a9721e52e9cb3a1e8ae26ba7f42929d15fb
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 04:58:02 GMT
URL: https://github.com/mono/monodevelop/commit/5c430a9721e52e9cb3a1e8ae26ba7f42929d15fb
Fixed 'Bug 15387 - Broken completion for class inheritance at namespace level '
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit d5aa75a29108ee38d001e9ce12dd2c958ab221f3
+Subproject commit 1dc2c2da3e2c8b7f524cd7d80c736d4a6e6a1de9
Commit: 6586f9422580c13f55ba310db789c710875dbefc
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 05:07:03 GMT
URL: https://github.com/mono/monodevelop/commit/6586f9422580c13f55ba310db789c710875dbefc
Try to fix 'Bug 15296 - MonoDevelop : `Navigate To` dialog eventually
freezes Monodevelop '.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
===================================================================
@@ -214,7 +214,7 @@ public void Update (SearchPopupSearchPattern pattern)
var cat = _cat;
var token = src.Token;
cat.GetResults (pattern, maxItems, token).ContinueWith (t => {
- if (t.IsCanceled)
+ if (t.IsCanceled)
return;
if (t.IsFaulted) {
LoggingService.LogError ("Error getting search results", t.Exception);
@@ -304,10 +304,11 @@ Gdk.Size GetIdealSize ()
protected override void OnSizeRequested (ref Requisition requisition)
{
base.OnSizeRequested (ref requisition);
-
- Gdk.Size idealSize = GetIdealSize ();
- requisition.Width = idealSize.Width;
- requisition.Height = idealSize.Height;
+ if (!inResize) {
+ Gdk.Size idealSize = GetIdealSize ();
+ requisition.Width = idealSize.Width;
+ requisition.Height = idealSize.Height;
+ }
}
ItemIdentifier GetItemAt (double px, double py)
Commit: 6d51a2ce560f6c9c87ed01bcbc6d199f3c19e475
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 05:28:30 GMT
URL: https://github.com/mono/monodevelop/commit/6d51a2ce560f6c9c87ed01bcbc6d199f3c19e475
Fixed 'Bug 15403 - Go to Definition does not work with user operators'
Changed paths:
M main/external/nrefactory
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 1dc2c2da3e2c8b7f524cd7d80c736d4a6e6a1de9
+Subproject commit cf4e8a135239beabe394ef5929827693b0c50127
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
===================================================================
@@ -45,6 +45,7 @@
using MonoDevelop.CSharp.Completion;
using MonoDevelop.Components;
using MonoDevelop.Projects;
+using Mono.Cecil.Cil;
namespace MonoDevelop.SourceEditor
{
@@ -301,7 +302,7 @@ TooltipInformation CreateTooltip (ToolTipData data, int offset, Ambience ambienc
doc.GetFormattingPolicy (),
member,
false);
- }else if (result is NamespaceResolveResult) {
+ } else if (result is NamespaceResolveResult) {
var tooltipInfo = new TooltipInformation ();
var resolver = (doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile).GetResolver (doc.Compilation, doc.Editor.Caret.Location);
var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
@@ -313,6 +314,19 @@ TooltipInformation CreateTooltip (ToolTipData data, int offset, Ambience ambienc
return new TooltipInformation ();
}
return tooltipInfo;
+ } else if (result is OperatorResolveResult) {
+ var or = result as OperatorResolveResult;
+ var tooltipInfo = new TooltipInformation ();
+ var resolver = (doc.ParsedDocument.ParsedFile as CSharpUnresolvedFile).GetResolver (doc.Compilation, doc.Editor.Caret.Location);
+ var sig = new SignatureMarkupCreator (resolver, doc.GetFormattingPolicy ().CreateOptions ());
+ sig.BreakLineAfterReturnType = false;
+ try {
+ tooltipInfo.SignatureMarkup = sig.GetMarkup (or.UserDefinedOperatorMethod);
+ } catch (Exception e) {
+ LoggingService.LogError ("Got exception while creating markup for :" + ((NamespaceResolveResult)result).Namespace, e);
+ return new TooltipInformation ();
+ }
+ return tooltipInfo;
} else {
return MemberCompletionData.CreateTooltipInformation (
doc.Compilation,
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
===================================================================
@@ -103,6 +103,8 @@ public static object GetItem (MonoDevelop.Ide.Gui.Document doc, out ResolveResul
return resolveResult.Type;
if (resolveResult is NamespaceResolveResult)
return ((NamespaceResolveResult)resolveResult).Namespace;
+ if (resolveResult is OperatorResolveResult)
+ return ((OperatorResolveResult)resolveResult).UserDefinedOperatorMethod;
return null;
}
Commit: d3ebaa22e42107b3369cb14f1e293529ec015b20
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 05:33:37 GMT
URL: https://github.com/mono/monodevelop/commit/d3ebaa22e42107b3369cb14f1e293529ec015b20
[Refactoring] Tweaked refactoring menu in case of user defined
operators.
Changed paths:
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
M main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
===================================================================
@@ -70,8 +70,11 @@ public override bool IsValid (RefactoringOptions options)
if (options.SelectedItem is IType && ((IType)options.SelectedItem).Kind == TypeKind.TypeParameter)
return !string.IsNullOrEmpty (((ITypeParameter)options.SelectedItem).Region.FileName);
- if (options.SelectedItem is IMember) {
- var cls = ((IMember)options.SelectedItem).DeclaringTypeDefinition;
+ var member = options.SelectedItem as IMember;
+ if (member != null) {
+ if (member.SymbolKind == SymbolKind.Operator)
+ return false;
+ var cls = member.DeclaringTypeDefinition;
return cls != null;
}
return false;
Modified: main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
===================================================================
@@ -336,7 +336,8 @@ protected override void Update (CommandArrayInfo ainfo)
}
}
- if (item is IEntity || item is ITypeParameter || item is IVariable || item is INamespace) {
+ if (!(item is IMethod && ((IMethod)item).SymbolKind == SymbolKind.Operator) && (item is IEntity || item is ITypeParameter || item is IVariable || item is INamespace)) {
+
ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindReferences), new System.Action (new FindRefs (item, false).Run));
if (doc.HasProject && HasOverloads (doc.Project.ParentSolution, item))
ainfo.Add (IdeApp.CommandService.GetCommandInfo (RefactoryCommands.FindAllReferences), new System.Action (new FindRefs (item, true).Run));
Commit: bba64efa1574c112ec89769d6d0341fa5f255a4a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 05:45:30 GMT
URL: https://github.com/mono/monodevelop/commit/bba64efa1574c112ec89769d6d0341fa5f255a4a
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit cf4e8a135239beabe394ef5929827693b0c50127
+Subproject commit 19d66f4891a9361c880f6c48d47273962e00613f
Commit: 2c386c845949a6e56e8790919cdb664fb00e5fb0
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-16 05:49:02 GMT
URL: https://github.com/mono/monodevelop/commit/2c386c845949a6e56e8790919cdb664fb00e5fb0
[CSharpBinding] Ensure that the syntax tree always matches the
resolver root node inside the refactoring context.
Changed paths:
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
===================================================================
@@ -70,7 +70,7 @@ public class MDRefactoringContext : RefactoringContext, IRefactoringContext
public SyntaxTree Unit {
get {
Debug.Assert (!IsInvalid);
- return ParsedDocument.GetAst<SyntaxTree> ();
+ return Resolver.RootNode as SyntaxTree;
}
}
Commit: 4a57c750b608bb04beef68f304df9ee84deaeb84
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-17 04:41:34 GMT
URL: https://github.com/mono/monodevelop/commit/4a57c750b608bb04beef68f304df9ee84deaeb84
Fixed 'Bug 15423 - Zooming text size changes tab width'.
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/StyledSourceEditorOptions.cs
===================================================================
@@ -53,6 +53,8 @@ public StyledSourceEditorOptions (Project styleParent, string mimeType)
public void UpdateStyleParent (Project styleParent, string mimeType)
{
+ if (styleParent != null && policyContainer == styleParent.Policies)
+ return;
if (policyContainer != null)
policyContainer.PolicyChanged -= HandlePolicyChanged;
@@ -67,12 +69,15 @@ public void UpdateStyleParent (Project styleParent, string mimeType)
currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
policyContainer.PolicyChanged += HandlePolicyChanged;
+ if (changed != null)
+ this.changed (this, EventArgs.Empty);
}
void HandlePolicyChanged (object sender, MonoDevelop.Projects.Policies.PolicyChangedEventArgs args)
{
currentPolicy = policyContainer.Get<TextStylePolicy> (mimeTypes);
- this.changed (this, EventArgs.Empty);
+ if (changed != null)
+ this.changed (this, EventArgs.Empty);
}
public bool OverrideDocumentEolMarker {
Commit: dab625a4774f8846838a7e297b7664cc53616f34
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-17 04:50:41 GMT
URL: https://github.com/mono/monodevelop/commit/dab625a4774f8846838a7e297b7664cc53616f34
[Ide] Another try to fix 'Bug 15296 - MonoDevelop : `Navigate To`
dialog eventually freezes Monodevelop'
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
===================================================================
@@ -127,6 +127,7 @@ public SearchPopupWindow ()
Events = Gdk.EventMask.ButtonPressMask | Gdk.EventMask.ButtonMotionMask | Gdk.EventMask.ButtonReleaseMask | Gdk.EventMask.ExposureMask | Gdk.EventMask.PointerMotionMask;
ItemActivated += (sender, e) => OpenFile ();
+ /*
SizeRequested += delegate(object o, SizeRequestedArgs args) {
if (inResize)
return;
@@ -139,7 +140,7 @@ public SearchPopupWindow ()
Visible = true;
inResize = false;
}
- };
+ };*/
}
bool inResize = false;
Commit: f5ddd6d1ea0a6f9affbccda9a193478bfc3eac48
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-17 13:56:22 GMT
URL: https://github.com/mono/monodevelop/commit/f5ddd6d1ea0a6f9affbccda9a193478bfc3eac48
[Core] Only send to Raygun when we're not in debug mode.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -50,7 +50,7 @@ public static class LoggingService
public static readonly FilePath CrashLogDirectory = UserProfile.Current.LogDir.Combine ("LogAgent");
- static RaygunClient raygunClient;
+ static RaygunClient raygunClient = null;
static List<ILogger> loggers = new List<ILogger> ();
static RemoteLogger remoteLogger;
static DateTime timestamp;
@@ -100,10 +100,12 @@ static LoggingService ()
timestamp = DateTime.Now;
+#if !DEBUG
string raygunKey = BrandingService.GetString ("RaygunApiKey");
if (raygunKey != null) {
raygunClient = new RaygunClient (raygunKey);
}
+#endif
//remove the default trace listener on .NET, it throws up horrible dialog boxes for asserts
System.Diagnostics.Debug.Listeners.Clear ();
Commit: 89e88cf39a676a20d290f2858be59f391cafa788
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-17 15:36:43 GMT
URL: https://github.com/mono/monodevelop/commit/89e88cf39a676a20d290f2858be59f391cafa788
[Core] Add ENABLE_RAYGUN constant.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
===================================================================
@@ -12,6 +12,9 @@
<BuildInfo>..\..\..\build\bin\buildinfo</BuildInfo>
<VcRevision>..\..\..\vcrevision</VcRevision>
</PropertyGroup>
+ <PropertyGroup Condition="'$(BUILD_REVISION)' != ''">
+ <DefineConstants>$(DefineConstants);ENABLE_RAYGUN</DefineConstants>
+ </PropertyGroup>
<Choose>
<When Condition=" Exists('c:\Program Files\Git\bin\git.exe') ">
<PropertyGroup>
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -100,7 +100,7 @@ static LoggingService ()
timestamp = DateTime.Now;
-#if !DEBUG
+#if ENABLE_RAYGUN
string raygunKey = BrandingService.GetString ("RaygunApiKey");
if (raygunKey != null) {
raygunClient = new RaygunClient (raygunKey);
Commit: 52c1389ef569c24de525e8328724bc3521b1e1c5
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-17 15:41:26 GMT
URL: https://github.com/mono/monodevelop/commit/52c1389ef569c24de525e8328724bc3521b1e1c5
Add environment variables section to README.
Changed paths:
M README
Modified: README
===================================================================
@@ -77,7 +77,14 @@ Dependencies
Gtk# >= 2.12.8
monodoc >= 1.0
mono-addins >= 0.6
-
+
+Special Environment Variables
+-----------------------------
+
+BUILD_REVISION
+ If this environment variable exists we assume we are compiling inside wrench
+
+
References
----------
Commit: 3900c9345923c92ff557f58a05f9e3a9a4565822
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-17 15:44:16 GMT
URL: https://github.com/mono/monodevelop/commit/3900c9345923c92ff557f58a05f9e3a9a4565822
Merge pull request #417 from mono/enable-raygun
[Core] Add ENABLE_RAYGUN constant.
Changed paths:
M README
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: README
===================================================================
@@ -77,7 +77,14 @@ Dependencies
Gtk# >= 2.12.8
monodoc >= 1.0
mono-addins >= 0.6
-
+
+Special Environment Variables
+-----------------------------
+
+BUILD_REVISION
+ If this environment variable exists we assume we are compiling inside wrench
+
+
References
----------
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
===================================================================
@@ -12,6 +12,9 @@
<BuildInfo>..\..\..\build\bin\buildinfo</BuildInfo>
<VcRevision>..\..\..\vcrevision</VcRevision>
</PropertyGroup>
+ <PropertyGroup Condition="'$(BUILD_REVISION)' != ''">
+ <DefineConstants>$(DefineConstants);ENABLE_RAYGUN</DefineConstants>
+ </PropertyGroup>
<Choose>
<When Condition=" Exists('c:\Program Files\Git\bin\git.exe') ">
<PropertyGroup>
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -100,7 +100,7 @@ static LoggingService ()
timestamp = DateTime.Now;
-#if !DEBUG
+#if ENABLE_RAYGUN
string raygunKey = BrandingService.GetString ("RaygunApiKey");
if (raygunKey != null) {
raygunClient = new RaygunClient (raygunKey);
Commit: 836ac19eb21d7cd6eb00c4b2dd921fdfdcb54c53
Author: lluis <[email protected]> (slluis)
Date: 2013-10-17 17:12:12 GMT
URL: https://github.com/mono/monodevelop/commit/836ac19eb21d7cd6eb00c4b2dd921fdfdcb54c53
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit c0a4f28ba9647460acb7f1474a347f8b53553c94
+Subproject commit 2ae52745894094dd4ce53f4ea0f6314a88251c03
Modified: version-checks
===================================================================
@@ -17,8 +17,8 @@ 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]=f65f2992976b8be63511c249883e1122515371df
-DEP_BRANCH_AND_REMOTE[0]="master origin/master"
+DEP_NEEDED_VERSION[0]=c8ed8691635fcd9457bf03de09ef6823ba470075
+DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
DEP[1]=heap-shot
Commit: 6b87d5da1a5e6aefea15c33e589e607108189ac6
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-17 20:55:55 GMT
URL: https://github.com/mono/monodevelop/commit/6b87d5da1a5e6aefea15c33e589e607108189ac6
[Vi] Add support for centering the text editor.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
===================================================================
@@ -884,6 +884,11 @@ protected override void HandleKeypress (Gdk.Key key, uint unicodeKey, Gdk.Modifi
// Fold open
action = FoldActions.OpenFold;
break;
+ case 'z':
+ case '.':
+ editor.CenterToCaret ();
+ Reset ("");
+ break;
default:
Reset ("Unknown command");
break;
Commit: 535a7f247217cf25dc7132ae373deb2db7129d5b
Author: lluis <[email protected]> (slluis)
Date: 2013-10-17 22:12:21 GMT
URL: https://github.com/mono/monodevelop/commit/535a7f247217cf25dc7132ae373deb2db7129d5b
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 2ae52745894094dd4ce53f4ea0f6314a88251c03
+Subproject commit c0fb2787ba440f15c90e59b8c3b5bf2c9274b561
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]=c8ed8691635fcd9457bf03de09ef6823ba470075
+DEP_NEEDED_VERSION[0]=5e4929dc937da71f39032df2a1d4f4bec8b47a44
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: f9228437649cf3ffef4c178d467a2359227b2d2c
Author: lluis <[email protected]> (slluis)
Date: 2013-10-17 22:16:48 GMT
URL: https://github.com/mono/monodevelop/commit/f9228437649cf3ffef4c178d467a2359227b2d2c
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit c0a4f28ba9647460acb7f1474a347f8b53553c94
+Subproject commit c0fb2787ba440f15c90e59b8c3b5bf2c9274b561
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]=f65f2992976b8be63511c249883e1122515371df
+DEP_NEEDED_VERSION[0]=92f4763a27236de5b012708e8fa3511b1034e499
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 9344ba1ae4fb377b514fd53f5b2bdb6cb9169d4c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-18 02:23:18 GMT
URL: https://github.com/mono/monodevelop/commit/9344ba1ae4fb377b514fd53f5b2bdb6cb9169d4c
Merge pull request #418 from mono/center-text-in-vi-mode
[Vi] Add support for centering the text editor.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViMode.cs
===================================================================
@@ -884,6 +884,11 @@ protected override void HandleKeypress (Gdk.Key key, uint unicodeKey, Gdk.Modifi
// Fold open
action = FoldActions.OpenFold;
break;
+ case 'z':
+ case '.':
+ editor.CenterToCaret ();
+ Reset ("");
+ break;
default:
Reset ("Unknown command");
break;
Commit: 870b5c830057e9c7846655180bbfb4585df743e2
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-18 03:39:22 GMT
URL: https://github.com/mono/monodevelop/commit/870b5c830057e9c7846655180bbfb4585df743e2
Fixed 'Bug 15475 - Generate switch cases should add missing cases'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 19d66f4891a9361c880f6c48d47273962e00613f
+Subproject commit 3ddebb399b0f04714ff57c56cb1b186fb330aadc
Commit: 0eba7a1f1f8b3b2d8521c1dc9f09102a3de7550e
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-18 04:27:28 GMT
URL: https://github.com/mono/monodevelop/commit/0eba7a1f1f8b3b2d8521c1dc9f09102a3de7550e
[Ide] Added base class for implementing xwt pads.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractPadContent.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractPadContent.cs
===================================================================
@@ -29,6 +29,7 @@
using System.Collections.Generic;
using System.Text;
using MonoDevelop.Core;
+using Xwt;
namespace MonoDevelop.Ide.Gui
{
@@ -89,4 +90,18 @@ public virtual void Dispose ()
#endregion
}
+
+ public abstract class AbstractXwtPadContent : AbstractPadContent
+ {
+ public sealed override Gtk.Widget Control {
+ get {
+ return (Gtk.Widget)Toolkit.CurrentEngine.GetNativeWidget (Widget);
+ }
+ }
+
+ public abstract Xwt.Widget Widget {
+ get;
+ }
+ }
+
}
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
===================================================================
@@ -155,7 +155,7 @@ public virtual void OnContentNameChanged (EventArgs e)
public abstract class AbstractXwtViewContent :AbstractViewContent
{
- public override Gtk.Widget Control {
+ public sealed override Gtk.Widget Control {
get {
return (Gtk.Widget)Toolkit.CurrentEngine.GetNativeWidget (Widget);
}
Commit: 9a3ec099158cbce0be6351b7ec19463751ba9b24
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-18 08:32:00 GMT
URL: https://github.com/mono/monodevelop/commit/9a3ec099158cbce0be6351b7ec19463751ba9b24
Revert "[Ide] Added base class for implementing xwt pads."
This reverts commit 0eba7a1f1f8b3b2d8521c1dc9f09102a3de7550e.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractPadContent.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractPadContent.cs
===================================================================
@@ -29,7 +29,6 @@
using System.Collections.Generic;
using System.Text;
using MonoDevelop.Core;
-using Xwt;
namespace MonoDevelop.Ide.Gui
{
@@ -90,18 +89,4 @@ public virtual void Dispose ()
#endregion
}
-
- public abstract class AbstractXwtPadContent : AbstractPadContent
- {
- public sealed override Gtk.Widget Control {
- get {
- return (Gtk.Widget)Toolkit.CurrentEngine.GetNativeWidget (Widget);
- }
- }
-
- public abstract Xwt.Widget Widget {
- get;
- }
- }
-
}
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractViewContent.cs
===================================================================
@@ -155,7 +155,7 @@ public virtual void OnContentNameChanged (EventArgs e)
public abstract class AbstractXwtViewContent :AbstractViewContent
{
- public sealed override Gtk.Widget Control {
+ public override Gtk.Widget Control {
get {
return (Gtk.Widget)Toolkit.CurrentEngine.GetNativeWidget (Widget);
}
Commit: d2dff0202372fea239cc0e4b1db72410545cfb88
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-18 14:21:08 GMT
URL: https://github.com/mono/monodevelop/commit/d2dff0202372fea239cc0e4b1db72410545cfb88
[Core] Specify the version to Raygun rather than let it use the assembly version.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -196,7 +196,7 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown,
if (raygunClient != null) {
ThreadPool.QueueUserWorkItem (delegate {
- raygunClient.Send (ex, tags);
+ raygunClient.Send (ex, tags, BuildInfo.Version);
});
}
Commit: 7db62e017296cddfa627d5c4205219cb1265e812
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-18 18:40:12 GMT
URL: https://github.com/mono/monodevelop/commit/7db62e017296cddfa627d5c4205219cb1265e812
minor code cleanup thanks to code analysis
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/FileService.cs
===================================================================
@@ -50,11 +50,11 @@ public static class FileService
static FileServiceErrorHandler errorHandler;
static FileSystemExtension fileSystemChain;
- static FileSystemExtension defaultExtension = Platform.IsWindows ? new DefaultFileSystemExtension () : new UnixFileSystemExtension () ;
+ static readonly FileSystemExtension defaultExtension = Platform.IsWindows ? new DefaultFileSystemExtension () : new UnixFileSystemExtension () ;
- static EventQueue eventQueue = new EventQueue ();
+ static readonly EventQueue eventQueue = new EventQueue ();
- static string applicationRootPath = Path.Combine (PropertyService.EntryAssemblyPath, "..");
+ static readonly string applicationRootPath = Path.Combine (PropertyService.EntryAssemblyPath, "..");
public static string ApplicationRootPath {
get {
return applicationRootPath;
@@ -249,7 +249,7 @@ public static bool RequestFileEdit (string fileName)
/// <summary>
/// Requests permission for modifying a file
/// </summary>
- /// <param name="fileName">The file to be modified</param>
+ /// <param name="fileName">The file to be modified</param>
/// <remarks>This method must be called before trying to write any file. It throws an exception if permission is not granted.</remarks>
public static bool RequestFileEdit (FilePath fileName, bool throwIfFails = true)
{
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
===================================================================
@@ -61,7 +61,7 @@ public abstract class Project : SolutionEntityItem
{
string[] buildActions;
- public Project ()
+ protected Project ()
{
FileService.FileChanged += OnFileChanged;
files = new ProjectFileCollection ();
Commit: 4608bd12c10f4695268f705d41367db567cd7be4
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-19 15:35:49 GMT
URL: https://github.com/mono/monodevelop/commit/4608bd12c10f4695268f705d41367db567cd7be4
Bump debugger-libs to pull in a fix for a nullreference exception
Changed paths:
M main/external/debugger-libs
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit 8c6cdc6a77abaf1a6ee75498c62c46474794a2b7
+Subproject commit 6dea7fa5220567b97b421143c3145aff68ed2667
Commit: b8704840acc9a5d0bcf244fb673d433580637d86
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-19 15:43:21 GMT
URL: https://github.com/mono/monodevelop/commit/b8704840acc9a5d0bcf244fb673d433580637d86
[build] Remove an unnecessary duplicate submodule
maccore is now submoduled by monomac itself. We don't need to get it
ourselves.
Changed paths:
M .gitmodules
Removed paths:
D main/external/maccore
Modified: .gitmodules
===================================================================
@@ -1,9 +1,6 @@
[submodule "main/external/cecil"]
path = main/external/cecil
url = git://github.com/mono/cecil.git
-[submodule "main/external/maccore"]
- path = main/external/maccore
- url = git://github.com/mono/maccore.git
[submodule "main/external/mono-tools"]
path = main/external/mono-tools
url = git://github.com/mono/mono-tools.git
Removed: main/external/maccore
===================================================================
@@ -1 +0,0 @@
-Subproject commit c56ff209497cf0fbbfeff3f5696eda58670facf7
Commit: 705b277ee93c773931305cbb793940944e91a9ea
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-10-19 15:57:39 GMT
URL: https://github.com/mono/monodevelop/commit/705b277ee93c773931305cbb793940944e91a9ea
Fix build for Win32.
Changed paths:
M main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs
Modified: main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorObjectAdaptor.cs
===================================================================
@@ -91,7 +91,7 @@ public override bool IsValueType (object type)
return ((CorType)type).Type == CorElementType.ELEMENT_TYPE_VALUETYPE;
}
- public override bool IsClass (object type)
+ public override bool IsClass (EvaluationContext ctx, object type)
{
return ((CorType)type).Type == CorElementType.ELEMENT_TYPE_CLASS && ((CorType)type).Class != null;
}
Commit: dbd1c0e5959a2e590aefa16357c85f5514f56e6e
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-19 21:40:13 GMT
URL: https://github.com/mono/monodevelop/commit/dbd1c0e5959a2e590aefa16357c85f5514f56e6e
[Project] Only default to MSBuild engine if referenced projects use it
MSBuild fails to handle project references if those projects cannot be
built with MSBuild.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectSubtypeNode.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/DotNetProjectSubtypeNode.cs
===================================================================
@@ -154,10 +154,8 @@ public virtual void InitializeHandler (SolutionEntityItem item)
MSBuildProjectHandler h = (MSBuildProjectHandler) ProjectExtensionUtil.GetItemHandler (item);
UpdateImports (item, h.TargetImports);
h.SubtypeGuids.Add (guid);
- if (UseXBuild)
- h.UseMSBuildEngineByDefault = true;
- if (RequireXBuild)
- h.RequireMSBuildEngine = true;
+ h.UseMSBuildEngineByDefault |= UseXBuild;
+ h.RequireMSBuildEngine |= RequireXBuild;
}
public void UpdateImports (SolutionEntityItem item, List<string> imports)
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
===================================================================
@@ -195,7 +195,7 @@ ProjectConfigurationInfo[] GetConfigurations (SolutionEntityItem item, Configura
IEnumerable<string> IAssemblyReferenceHandler.GetAssemblyReferences (ConfigurationSelector configuration)
{
- if (UseMSBuildEngineForItem (Item)) {
+ if (UseMSBuildEngineForItem (Item, configuration)) {
// Get the references list from the msbuild project
SolutionEntityItem item = (SolutionEntityItem) Item;
RemoteProjectBuilder builder = GetProjectBuilder ();
@@ -217,7 +217,7 @@ IEnumerable<string> IAssemblyReferenceHandler.GetAssemblyReferences (Configurati
public override BuildResult RunTarget (IProgressMonitor monitor, string target, ConfigurationSelector configuration)
{
- if (UseMSBuildEngineForItem (Item)) {
+ if (UseMSBuildEngineForItem (Item, configuration)) {
SolutionEntityItem item = Item as SolutionEntityItem;
if (item != null) {
@@ -342,9 +342,26 @@ public SolutionEntityItem Load (IProgressMonitor monitor, string fileName, MSBui
}
/// <summary>Whether to use the MSBuild engine for the specified item.</summary>
- internal bool UseMSBuildEngineForItem (SolutionItem item)
+ internal bool UseMSBuildEngineForItem (SolutionItem item, ConfigurationSelector sel, bool checkReferences = true)
{
- return item.UseMSBuildEngine ?? UseMSBuildEngineByDefault;
+ // if the item mandates MSBuild, always use it
+ if (RequireMSBuildEngine)
+ return true;
+ // if the user has set the option, use the setting
+ if (item.UseMSBuildEngine.HasValue)
+ return item.UseMSBuildEngine.Value;
+
+ // If the item type defaults to using MSBuild, only use MSBuild if its direct references also use MSBuild.
+ // This prevents a not-uncommon common error referencing non-MSBuild projects from MSBuild projects
+ // NOTE: This adds about 11ms to the load/build/etc times of the MonoDevelop solution. Doing it recursively
+ // adds well over a second.
+ return UseMSBuildEngineByDefault && (
+ !checkReferences ||
+ item.GetReferencedItems (sel).All (i => {
+ var h = i.ItemHandler as MSBuildProjectHandler;
+ return h != null && h.UseMSBuildEngineForItem (i, sel, false);
+ })
+ );
}
/// <summary>Whether to use the MSBuild engine by default.</summary>
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects/Project.cs
===================================================================
@@ -405,10 +405,10 @@ public ProjectFile AddDirectory (string relativePath)
//HACK: the build code is structured such that support file copying is in here instead of the item handler
//so in order to avoid doing them twice when using the msbuild engine, we special-case them
- bool UsingMSBuildEngine ()
+ bool UsingMSBuildEngine (ConfigurationSelector sel)
{
var msbuildHandler = ItemHandler as MonoDevelop.Projects.Formats.MSBuild.MSBuildProjectHandler;
- return msbuildHandler != null && msbuildHandler.UseMSBuildEngineForItem (this);
+ return msbuildHandler != null && msbuildHandler.UseMSBuildEngineForItem (this, sel);
}
protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
@@ -423,7 +423,7 @@ protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationS
StringParserService.Properties["Project"] = Name;
- if (UsingMSBuildEngine ()) {
+ if (UsingMSBuildEngine (configuration)) {
return DoBuild (monitor, configuration);
}
@@ -649,7 +649,7 @@ protected override void OnClean (IProgressMonitor monitor, ConfigurationSelector
return;
}
- if (UsingMSBuildEngine ()) {
+ if (UsingMSBuildEngine (configuration)) {
DoClean (monitor, config.Selector);
return;
}
Commit: 29a925e890b733b6dc4f4dcfadf41b2b52eabc36
Author: builder <[email protected]>
Date: 2013-10-20 18:29:55 GMT
URL: https://github.com/mono/monodevelop/commit/29a925e890b733b6dc4f4dcfadf41b2b52eabc36
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]=5e4929dc937da71f39032df2a1d4f4bec8b47a44
+DEP_NEEDED_VERSION[0]=01f90f9be813c2638fa91cbd074896b0734cfcb3
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 26c94b2b3d68f73a7476447d81346acee687ff2e
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-21 03:58:12 GMT
URL: https://github.com/mono/monodevelop/commit/26c94b2b3d68f73a7476447d81346acee687ff2e
[Debugger] Set DebugValueWindow's TypeHint to Tooltip to fix focus issue.
This should cause this window to act like a tooltip window so it doesn't steal
focus away from the main window.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=14526
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
===================================================================
@@ -70,10 +70,10 @@ public class DebugValueWindow : PopoverWindow
ScrolledWindow sw;
// PinWindow pinWindow;
// TreeIter currentPinIter;
-
+
public DebugValueWindow (Mono.TextEditor.TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch): base (Gtk.WindowType.Toplevel)
{
- this.TypeHint = WindowTypeHint.PopupMenu;
+ this.TypeHint = WindowTypeHint.Tooltip;
this.AllowShrink = false;
this.AllowGrow = false;
this.Decorated = false;
Commit: 1d7cd9b1ba357217a5bc3da55735ae9e6abfe34a
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-21 04:20:45 GMT
URL: https://github.com/mono/monodevelop/commit/1d7cd9b1ba357217a5bc3da55735ae9e6abfe34a
[Ide] Implemented search in solution category.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Added paths:
A main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
Added: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
===================================================================
@@ -0,0 +1,118 @@
+//
+// SearchInSolutionSearchCategory.cs
+//
+// Author:
+// Mike Krüger <[email protected]>
+//
+// Copyright (c) 2013 Xamarin Inc. (http://xamarin.com)
+//
+// 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.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
+using ICSharpCode.NRefactory.TypeSystem;
+using MonoDevelop.Ide.FindInFiles;
+using System.Linq;
+using MonoDevelop.Ide.Gui;
+
+namespace MonoDevelop.Components.MainToolbar
+{
+ class SearchInSolutionSearchCategory : SearchCategory
+ {
+ public SearchInSolutionSearchCategory () : base (GettextCatalog.GetString("Search"))
+ {
+ }
+
+ public override Task<ISearchDataSource> GetResults (SearchPopupSearchPattern searchPattern, int resultsCount, CancellationToken token)
+ {
+ return Task.Factory.StartNew (delegate {
+ return (ISearchDataSource)new SearchInSolutionDataSource (searchPattern);
+ });
+ }
+
+ public override bool IsValidTag (string tag)
+ {
+ return tag == "search";
+ }
+
+ class SearchInSolutionDataSource : ISearchDataSource
+ {
+ readonly SearchPopupSearchPattern searchPattern;
+
+ public SearchInSolutionDataSource (SearchPopupSearchPattern searchPattern)
+ {
+ this.searchPattern = searchPattern;
+ }
+
+ #region ISearchDataSource implementation
+
+ Gdk.Pixbuf ISearchDataSource.GetIcon (int item)
+ {
+ return null;
+ }
+
+ string ISearchDataSource.GetMarkup (int item, bool isSelected)
+ {
+ return GettextCatalog.GetString ("Search in solution");
+ }
+
+ string ISearchDataSource.GetDescriptionMarkup (int item, bool isSelected)
+ {
+ return null;
+ }
+
+ MonoDevelop.Ide.CodeCompletion.TooltipInformation ISearchDataSource.GetTooltip (int item)
+ {
+ return null;
+ }
+
+ double ISearchDataSource.GetWeight (int item)
+ {
+ return 0;
+ }
+
+ DomRegion ISearchDataSource.GetRegion (int item)
+ {
+ return DomRegion.Empty;
+ }
+
+ bool ISearchDataSource.CanActivate (int item)
+ {
+ return true;
+ }
+
+ void ISearchDataSource.Activate (int item)
+ {
+ var options = new FilterOptions ();
+ if (PropertyService.Get ("AutoSetPatternCasing", true))
+ options.CaseSensitive = searchPattern.Pattern.Any (c => char.IsUpper (c));
+ FindInFilesDialog.SearchReplace (searchPattern.Pattern, null, new WholeSolutionScope (), options, null);
+ }
+
+ int ISearchDataSource.ItemCount {
+ get {
+ return 1;
+ }
+ }
+ #endregion
+ }
+ }
+}
+
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
===================================================================
@@ -119,6 +119,7 @@ public SearchPopupWindow ()
categories.Add (new ProjectSearchCategory (this));
categories.Add (new FileSearchCategory (this));
categories.Add (new CommandSearchCategory (this));
+ categories.Add (new SearchInSolutionSearchCategory ());
layout = new Pango.Layout (PangoContext);
headerLayout = new Pango.Layout (PangoContext);
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
===================================================================
@@ -25,8 +25,8 @@
// THE SOFTWARE.
using System;
-using System.Linq;
-using System.Threading;
+using System.Linq;
+using System.Threading;
using System.Text;
using MonoDevelop.Core;
using MonoDevelop.Ide.Gui;
@@ -38,7 +38,7 @@
namespace MonoDevelop.Ide.FindInFiles
{
public partial class FindInFilesDialog : Gtk.Dialog
- {
+ {
readonly bool writeScope = true;
enum SearchScope {
@@ -48,15 +48,15 @@ enum SearchScope {
Directories,
CurrentDocument,
Selection
- }
+ }
- CheckButton checkbuttonRecursively;
+ CheckButton checkbuttonRecursively;
ComboBoxEntry comboboxentryReplace;
ComboBoxEntry comboboxentryPath;
SearchEntry searchentryFileMask;
Button buttonBrowsePaths;
Button buttonReplace;
- Label labelFileMask;
+ Label labelFileMask;
Label labelReplace;
Label labelPath;
HBox hboxPath;
@@ -509,8 +509,8 @@ protected override void OnSizeRequested (ref Requisition requisition)
{
base.OnSizeRequested (ref requisition);
requisition.Width = Math.Max (480, requisition.Width);
- }
-
+ }
+
static void ComboboxentryPathDestroyed (object sender, EventArgs e)
{
StoreHistory ("MonoDevelop.FindReplaceDialogs.PathHistory", (ComboBoxEntry)sender);
@@ -530,8 +530,8 @@ void ButtonBrowsePathsClicked (object sender, EventArgs e)
if (dlg.Run ())
comboboxentryPath.Entry.Text = dlg.SelectedFile;
- }
-
+ }
+
void CheckbuttonRecursivelyDestroyed (object sender, EventArgs e)
{
properties.Set ("SearchPathRecursively", ((CheckButton)sender).Active);
@@ -675,10 +675,10 @@ Scope GetScope ()
break;
case SearchScope.CurrentProject:
var currentSelectedProject = IdeApp.ProjectOperations.CurrentSelectedProject;
- if (currentSelectedProject != null) {
+ if (currentSelectedProject != null) {
scope = new WholeProjectScope (currentSelectedProject);
break;
- }
+ }
if (IdeApp.Workspace.IsOpen && IdeApp.ProjectOperations.CurrentSelectedSolution != null) {
var question = GettextCatalog.GetString (
"Currently there is no project selected. Search in the solution instead ?");
@@ -720,21 +720,21 @@ FilterOptions GetFilterOptions ()
CaseSensitive = checkbuttonCaseSensitive.Active,
RegexSearch = checkbuttonRegexSearch.Active,
WholeWordsOnly = checkbuttonWholeWordsOnly.Active
- };
+ };
}
static FindReplace find;
void HandleReplaceClicked (object sender, EventArgs e)
{
- SearchReplace (comboboxentryReplace.Entry.Text ?? "");
+ SearchReplace (comboboxentryFind.Entry.Text, comboboxentryReplace.Entry.Text ?? "", GetScope (), GetFilterOptions (), () => UpdateStopButton ());
}
void HandleSearchClicked (object sender, EventArgs e)
{
- SearchReplace (null);
- }
-
- readonly List<ISearchProgressMonitor> searchesInProgress = new List<ISearchProgressMonitor> ();
+ SearchReplace (comboboxentryFind.Entry.Text, null, GetScope (), GetFilterOptions (), () => UpdateStopButton ());
+ }
+
+ readonly static List<ISearchProgressMonitor> searchesInProgress = new List<ISearchProgressMonitor> ();
void UpdateStopButton ()
{
buttonStop.Sensitive = searchesInProgress.Count > 0;
@@ -750,7 +750,7 @@ void ButtonStopClicked (object sender, EventArgs e)
}
}
- void SearchReplace (string replacePattern)
+ internal static void SearchReplace (string findPattern, string replacePattern, Scope scope, FilterOptions options, System.Action UpdateStopButton)
{
if (find != null && find.IsRunning) {
if (!MessageService.Confirm (GettextCatalog.GetString ("There is a search already in progress. Do you want to stop it?"), AlertButton.Stop))
@@ -762,14 +762,12 @@ void SearchReplace (string replacePattern)
}
}
- Scope scope = GetScope ();
if (scope == null)
return;
find = new FindReplace ();
- string pattern = comboboxentryFind.Entry.Text;
- FilterOptions options = GetFilterOptions ();
+ string pattern = findPattern;
if (!find.ValidatePattern (options, pattern)) {
MessageService.ShowError (GettextCatalog.GetString ("Search pattern is invalid"));
return;
@@ -786,7 +784,11 @@ void SearchReplace (string replacePattern)
lock (searchesInProgress)
searchesInProgress.Add (searchMonitor);
- UpdateStopButton ();
+ if (UpdateStopButton != null) {
+ Application.Invoke (delegate {
+ UpdateStopButton ();
+ });
+ }
DateTime timer = DateTime.Now;
string errorMessage = null;
@@ -797,7 +799,7 @@ void SearchReplace (string replacePattern)
if (searchMonitor.IsCancelRequested)
return;
results.Add (result);
- }
+ }
searchMonitor.ReportResults (results);
} catch (Exception ex) {
errorMessage = ex.Message;
@@ -821,9 +823,11 @@ void SearchReplace (string replacePattern)
searchMonitor.Log.WriteLine (GettextCatalog.GetString ("Search time: {0} seconds."), (DateTime.Now - timer).TotalSeconds);
searchesInProgress.Remove (searchMonitor);
}
- Application.Invoke (delegate {
- UpdateStopButton ();
- });
+ if (UpdateStopButton != null) {
+ Application.Invoke (delegate {
+ UpdateStopButton ();
+ });
+ }
});
}
}
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
===================================================================
@@ -22,8 +22,8 @@
</Execution>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<DefineConstants>DEBUG</DefineConstants>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\bin\MonoDevelop.Ide.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,8 +36,8 @@
</Execution>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<DebugSymbols>true</DebugSymbols>
- <GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591;1573</NoWarn>
+ <DocumentationFile>..\..\..\build\AddIns\MonoDevelop.Ide.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -1901,6 +1901,7 @@
<Compile Include="MonoDevelop.Ide.TypeSystem\IRefactoringContext.cs" />
<Compile Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\ImplicitFrameworkAssemblyReferenceNodeBuilder.cs" />
<Compile Include="MonoDevelop.Ide.Gui.Pads.ProjectPad\PortableFrameworkSubsetNodeBuilder.cs" />
+ <Compile Include="MonoDevelop.Components.MainToolbar\SearchInSolutionSearchCategory.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Makefile.am" />
Commit: 4e1329c51daa29e848b4db8caf13f53f1d8226b6
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-21 14:08:59 GMT
URL: https://github.com/mono/monodevelop/commit/4e1329c51daa29e848b4db8caf13f53f1d8226b6
[Xwt] Fix GTK label link positions
Changed paths:
M main/external/xwt
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit c0fb2787ba440f15c90e59b8c3b5bf2c9274b561
+Subproject commit 6800aa6ec6363805e012b8c882c4a2fd6f64d73f
Commit: 93977297080442bae05fa24a7d144276716982e4
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-21 17:17:04 GMT
URL: https://github.com/mono/monodevelop/commit/93977297080442bae05fa24a7d144276716982e4
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 3ddebb399b0f04714ff57c56cb1b186fb330aadc
+Subproject commit ad45f0292f393a7586137df9df132b1e9738cc91
Commit: 0e449709a79c74149ffda98c3f239bc2ae274972
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-21 17:17:04 GMT
URL: https://github.com/mono/monodevelop/commit/0e449709a79c74149ffda98c3f239bc2ae274972
[Ide] References finder only searches compileable files.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchCollector.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchCollector.cs
===================================================================
@@ -161,7 +161,7 @@ IEnumerable<FileList> CollectFiles ()
if (searchProjectAdded) break;
}
foreach (var project in collectedProjects)
- yield return new FileList (project, TypeSystemService.GetProjectContext (project), project.Files.Select (f => f.FilePath));
+ yield return new FileList (project, TypeSystemService.GetProjectContext (project), project.Files.Where (f => f.BuildAction == BuildAction.Compile).Select (f => f.FilePath));
foreach (var files in collectedFiles)
yield return new FileList (files.Key, TypeSystemService.GetProjectContext (files.Key), files.Value.Select (f => (FilePath)f));
Commit: e8b4751b9b01f281478e07e4c17b660aef746d25
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-21 19:07:40 GMT
URL: https://github.com/mono/monodevelop/commit/e8b4751b9b01f281478e07e4c17b660aef746d25
[Core] Send full system information to Raygun in a custom data attribute.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -27,6 +27,7 @@
//
using System;
+using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
@@ -194,9 +195,12 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown,
data = stream.ToArray ();
}
+ var customData = new Hashtable ();
+ customData["SystemInformation"] = SystemInformation.GetTextDescription ();
+
if (raygunClient != null) {
ThreadPool.QueueUserWorkItem (delegate {
- raygunClient.Send (ex, tags, BuildInfo.Version);
+ raygunClient.Send (ex, tags, customData, BuildInfo.Version);
});
}
Commit: 424ce28020c3fd20e73ebfd2b060188433c284f5
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-21 21:45:55 GMT
URL: https://github.com/mono/monodevelop/commit/424ce28020c3fd20e73ebfd2b060188433c284f5
[TestRunner] Fixed commandline running on Windows.
Changed paths:
M main/tests/TestRunner/Runner.cs
Modified: main/tests/TestRunner/Runner.cs
===================================================================
@@ -38,7 +38,7 @@ public class Runer: IApplication
{
public int Run (string[] arguments)
{
- var args = new List<string> (arguments);
+ var args = new List<string> (arguments.Select (argument => Path.GetFullPath (argument)));
bool useGuiUnit = false;
foreach (var ar in args) {
if ((ar.EndsWith (".dll") || ar.EndsWith (".exe")) && File.Exists (ar)) {
Commit: 50ed6f3ee1b014bc676a2c5c7575a3e763e27b71
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-21 22:59:54 GMT
URL: https://github.com/mono/monodevelop/commit/50ed6f3ee1b014bc676a2c5c7575a3e763e27b71
[Version Control] Hide what's not API and seal most stuff.
The only thing left to do is sealing a demon. Or keeping me aaway from this.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
===================================================================
@@ -65,7 +65,7 @@ protected override void Update (CommandInfo info)
}
}
- class PushCommandHandler: GitCommandHandler
+ sealed class PushCommandHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -73,7 +73,7 @@ protected override void Run ()
}
}
- class SwitchToBranchHandler: GitCommandHandler
+ sealed class SwitchToBranchHandler: GitCommandHandler
{
protected override void Run (object dataItem)
{
@@ -102,7 +102,7 @@ protected override void Update (CommandArrayInfo info)
}
}
- class ManageBranchesHandler: GitCommandHandler
+ sealed class ManageBranchesHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -110,7 +110,7 @@ protected override void Run ()
}
}
- class MergeBranchHandler: GitCommandHandler
+ sealed class MergeBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -118,7 +118,7 @@ protected override void Run ()
}
}
- class RebaseBranchHandler: GitCommandHandler
+ sealed class RebaseBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -126,7 +126,7 @@ protected override void Run ()
}
}
- class StashHandler: GitCommandHandler
+ sealed class StashHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -153,7 +153,7 @@ protected override void Run ()
}
}
- class StashPopHandler: GitCommandHandler
+ sealed class StashPopHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class ManageStashesHandler: GitCommandHandler
+ sealed class ManageStashesHandler: GitCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class FilteredStatus : NGit.Api.StatusCommand
+ sealed class FilteredStatus : NGit.Api.StatusCommand
{
WorkingTreeIterator iter;
IndexDiff diff;
@@ -76,7 +76,7 @@ public override NGit.Api.Status Call ()
return new NGit.Api.Status (diff);
}
- public virtual ICollection<string> GetIgnoredNotInIndex ()
+ public ICollection<string> GetIgnoredNotInIndex ()
{
return diff.GetIgnoredNotInIndex ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCommitDialogExtension: CommitDialogExtension
+ public sealed class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCredentials: CredentialsProvider
+ public sealed class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitNodeBuilderExtension: NodeBuilderExtension
+ public sealed class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitOptionsPanel : OptionsPanel
+ public sealed class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
===================================================================
@@ -1713,7 +1713,7 @@ protected override void OnUnignore (FilePath[] localPath)
}
}
- public class GitRevision: Revision
+ public sealed class GitRevision: Revision
{
readonly string rev;
@@ -1753,13 +1753,13 @@ public override Revision GetPrevious ()
}
}
- public class Branch
+ public sealed class Branch
{
public string Name { get; internal set; }
public string Tracking { get; internal set; }
}
- public class RemoteSource
+ public sealed class RemoteSource
{
internal RemoteConfig RepoRemote;
internal StoredConfig cfg;
@@ -1800,7 +1800,7 @@ internal void Update ()
public string PushUrl { get; internal set; }
}
- class GitMonitor: ProgressMonitor, IDisposable
+ sealed class GitMonitor: ProgressMonitor, IDisposable
{
readonly IProgressMonitor monitor;
int currentWork;
@@ -1872,7 +1872,7 @@ public void Dispose ()
}
}
- class LocalGitRepository: FileRepository
+ sealed class LocalGitRepository: FileRepository
{
WeakReference dirCacheRef;
DateTime dirCacheTimestamp;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class GitSelectRevisionDialog : Xwt.Dialog
+ sealed class GitSelectRevisionDialog : Xwt.Dialog
{
readonly Xwt.TextEntry tagNameEntry;
readonly Xwt.TextEntry tagMessageEntry;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitSupportFeature: ISolutionItemFeature
+ public sealed class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
===================================================================
@@ -41,7 +41,7 @@
namespace MonoDevelop.VersionControl.Git
{
- internal static class GitUtil
+ static class GitUtil
{
public static string ToGitPath (this NGit.Repository repo, FilePath filePath)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class MyersDiff : GitCommand<IList<DiffEntry>>
+ public sealed class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetCached(bool cached)
+ public MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public virtual MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOutputStream(OutputStream @out)
+ public MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public virtual MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetContextLines(int contextLines)
+ public MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public virtual MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
+ public MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
+ public MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
===================================================================
@@ -38,7 +38,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class Stash
+ public sealed class Stash
{
internal string CommitId { get; private set; }
internal string FullLine { get; private set; }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -64,7 +64,7 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
+ public sealed class LibApr0: LibApr
{
private const string aprlib = "libapr-0.so.0";
@@ -97,7 +97,7 @@ public class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public class LibApr1: LibApr
+ public sealed class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient0 : LibSvnClient {
+ public sealed class LibSvnClient0 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient1 : LibSvnClient {
+ public sealed class LibSvnClient1 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Subversion
{
- public class SvnRevision : Revision
+ public sealed class SvnRevision : Revision
{
public readonly int Rev;
public readonly int Kind;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlGeneralOptionsPanel : OptionsPanel
+ public sealed class VersionControlGeneralOptionsPanel : OptionsPanel
{
Xwt.CheckBox disableVersionControl;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
+ public sealed class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
{
CommitMessageStylePanelWidget widget;
CommitMessageFormat format;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
===================================================================
@@ -34,7 +34,7 @@ public interface IBlameView : IAttachableViewContent
{
}
- internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+ sealed class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
{
BlameWidget widget;
VersionControlDocumentInfo info;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
===================================================================
@@ -44,7 +44,7 @@ public enum BlameCommands {
ShowLog
}
- public class BlameWidget : Bin
+ public sealed class BlameWidget : Bin
{
Adjustment vAdjustment;
Gtk.VScrollbar vScrollBar;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl.Views
{
[System.ComponentModel.ToolboxItem (true)]
- public class ChangeSetView: ScrolledWindow
+ public sealed class ChangeSetView: ScrolledWindow
{
bool disposed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Views
{
[ToolboxItem (true)]
- public class ComparisonWidget : EditorCompareWidgetBase
+ public sealed class ComparisonWidget : EditorCompareWidgetBase
{
internal DropDownBox originalComboBox, diffComboBox;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
/// <summary>
/// Parser for unified diffs
/// </summary>
- public class DiffParser : TypeSystemParser
+ public sealed class DiffParser : TypeSystemParser
{
// Match the original file and time/revstamp line, capturing the filepath and the stamp
static Regex fileHeaderExpression = new Regex (@"^---\s+(?<filepath>[^\t]+)\t(?<stamp>.*)$", RegexOptions.Compiled);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
===================================================================
@@ -35,7 +35,7 @@ public interface IDiffView : IAttachableViewContent
{
}
- public class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
+ sealed class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
{
DiffWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Views
//FIXME: re-merge this with MonoDevelop.Components.DropDownBox
[Category ("Widgets")]
[ToolboxItem (true)]
- public class DropDownBox : Gtk.Button
+ public sealed class DropDownBox : Gtk.Button
{
Pango.Layout layout;
const int pixbufSpacing = 2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
===================================================================
@@ -13,7 +13,7 @@ public interface ILogView : IAttachableViewContent
{
}
- public class LogView : BaseView, ILogView
+ sealed class LogView : BaseView, ILogView
{
LogWidget widget;
VersionInfo vinfo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
===================================================================
@@ -32,7 +32,7 @@ public interface IMergeView : IAttachableViewContent
{
}
- class MergeView : BaseView, IMergeView
+ sealed class MergeView : BaseView, IMergeView
{
VersionControlDocumentInfo info;
MergeWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
===================================================================
@@ -36,7 +36,7 @@
namespace MonoDevelop.VersionControl.Views
{
- public class MergeWidget : EditorCompareWidgetBase
+ public sealed class MergeWidget : EditorCompareWidgetBase
{
protected override TextEditor MainEditor {
get {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl.Views
{
- internal class StatusView : BaseView
+ sealed class StatusView : BaseView
{
string filepath;
Repository vc;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Views
{
- class SubviewAttachmentHandler : CommandHandler
+ sealed class SubviewAttachmentHandler : CommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- internal class AddCommand
+ sealed class AddCommand
{
public static bool Add (VersionControlItemList items, bool test)
{
@@ -17,7 +17,7 @@ public static bool Add (VersionControlItemList items, bool test)
return true;
}
- private class AddWorker : Task {
+ class AddWorker : Task {
VersionControlItemList items;
public AddWorker (VersionControlItemList items)
@@ -92,7 +92,7 @@ protected override void Run ()
//
// }
- internal class RemoveCommand
+ sealed class RemoveCommand
{
public static bool Remove (VersionControlItemList items, bool test)
{
@@ -108,7 +108,7 @@ public static bool Remove (VersionControlItemList items, bool test)
return true;
}
- private class RemoveWorker : Task {
+ class RemoveWorker : Task {
VersionControlItemList items;
public RemoveWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
@@ -4,11 +4,11 @@
namespace MonoDevelop.VersionControl
{
- public abstract class BaseView : AbstractBaseViewContent, IViewContent
+ abstract class BaseView : AbstractBaseViewContent, IViewContent
{
string name;
- public BaseView (string name)
+ protected BaseView (string name)
{
this.name = name;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class BlameCommand
+ static class BlameCommand
{
internal static readonly string BlameViewHandlers = "/MonoDevelop/VersionControl/BlameViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
===================================================================
@@ -36,10 +36,10 @@
namespace MonoDevelop.VersionControl
{
- class ChangeLogWriter
+ sealed class ChangeLogWriter
{
- private Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
- private string changelog_path;
+ Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
+ string changelog_path;
AuthorInformation uinfo;
public ChangeLogWriter (string path, AuthorInformation uinfo)
@@ -69,7 +69,7 @@ public void AddFile (string message, string path)
}
}
- private string GetRelativeEntryPath (string path)
+ string GetRelativeEntryPath (string path)
{
if (!path.StartsWith (changelog_path, System.StringComparison.Ordinal)) {
return null;
@@ -85,13 +85,13 @@ public override string ToString ()
CommitMessageStyle message_style = MessageFormat.Style;
- TextFormatter formatter = new TextFormatter ();
+ var formatter = new TextFormatter ();
formatter.MaxColumns = MessageFormat.MaxColumns;
formatter.TabWidth = MessageFormat.TabWidth;
formatter.TabsAsSpaces = MessageFormat.TabsAsSpaces;
if (message_style.Header.Length > 0) {
- string [,] tags = new string[,] { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
+ string [,] tags = { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
formatter.Append (StringParserService.Parse (message_style.Header, tags));
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl
{
- internal class CheckoutCommand : CommandHandler
+ sealed class CheckoutCommand : CommandHandler
{
protected override void Update (CommandInfo info)
{
@@ -25,79 +25,79 @@ protected override void Run()
del.Destroy ();
}
}
- }
-
- class CheckoutWorker : Task
- {
- Repository vc;
- string path;
-
- public CheckoutWorker (Repository vc, string path)
- {
- this.vc = vc;
- this.path = path;
- OperationType = VersionControlOperationType.Pull;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Checking out {0}...", path);
- }
-
- protected override IProgressMonitor CreateProgressMonitor ()
- {
- return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
- base.CreateProgressMonitor (),
- new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
- );
- }
-
- protected override void Run ()
+
+ class CheckoutWorker : Task
{
- vc.Checkout (path, null, true, Monitor);
- if (Monitor.IsCancelRequested) {
- Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
- return;
- }
+ Repository vc;
+ string path;
- if (!System.IO.Directory.Exists (path)) {
- Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
- return;
+ public CheckoutWorker (Repository vc, string path)
+ {
+ this.vc = vc;
+ this.path = path;
+ OperationType = VersionControlOperationType.Pull;
}
- string projectFn = null;
-
- string[] list = System.IO.Directory.GetFiles(path);
- foreach (string str in list ) {
- if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Checking out {0}...", path);
}
- if ( projectFn == null ) {
- foreach ( string str in list ) {
- if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
- }
+
+ protected override IProgressMonitor CreateProgressMonitor ()
+ {
+ return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
+ base.CreateProgressMonitor (),
+ new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+ );
}
- if ( projectFn == null ) {
+
+ protected override void Run ()
+ {
+ vc.Checkout (path, null, true, Monitor);
+ if (Monitor.IsCancelRequested) {
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
+ return;
+ }
+
+ if (!System.IO.Directory.Exists (path)) {
+ Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
+ return;
+ }
+
+ string projectFn = null;
+
+ string[] list = System.IO.Directory.GetFiles(path);
foreach (string str in list ) {
- if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
projectFn = str;
break;
}
- }
- }
-
- if (projectFn != null) {
- DispatchService.GuiDispatch (delegate {
- IdeApp.Workspace.OpenWorkspaceItem (projectFn);
- });
+ }
+ if ( projectFn == null ) {
+ foreach ( string str in list ) {
+ if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+ if ( projectFn == null ) {
+ foreach (string str in list ) {
+ if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+
+ if (projectFn != null) {
+ DispatchService.GuiDispatch (delegate {
+ IdeApp.Workspace.OpenWorkspaceItem (projectFn);
+ });
+ }
+
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
-
- Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
===================================================================
@@ -129,7 +129,7 @@ protected virtual bool RunCommand (VersionControlItemList items, bool test)
}
}
- class UpdateCommandHandler: SolutionVersionControlCommandHandler
+ sealed class UpdateCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -137,7 +137,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class StatusCommandHandler: SolutionVersionControlCommandHandler
+ sealed class StatusCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -145,7 +145,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class AddCommandHandler: FileVersionControlCommandHandler
+ sealed class AddCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -159,7 +159,7 @@ protected override void Update (CommandInfo info)
}
}
- class RemoveCommandHandler: FileVersionControlCommandHandler
+ sealed class RemoveCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -173,7 +173,7 @@ protected override void Update (CommandInfo info)
}
}
- class RevertCommandHandler: FileVersionControlCommandHandler
+ sealed class RevertCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class LockCommandHandler: FileVersionControlCommandHandler
+ sealed class LockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -201,7 +201,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnlockCommandHandler: FileVersionControlCommandHandler
+ sealed class UnlockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -215,7 +215,7 @@ protected override void Update (CommandInfo info)
}
}
- class IgnoreCommandHandler : FileVersionControlCommandHandler
+ sealed class IgnoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -229,7 +229,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnignoreCommandHandler : FileVersionControlCommandHandler
+ sealed class UnignoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -243,7 +243,7 @@ protected override void Update (CommandInfo info)
}
}
- class CurrentFileDiffHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileDiffHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -252,7 +252,7 @@ protected override void Run ()
}
}
- class CurrentFileBlameHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileBlameHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -261,7 +261,7 @@ protected override void Run ()
}
}
- class CurrentFileLogHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileLogHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- class CommitCommand
+ static class CommitCommand
{
public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
{
@@ -49,7 +49,7 @@ public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
}
}
- private class CommitWorker : Task
+ class CommitWorker : Task
{
Repository vc;
ChangeSet changeSet;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
===================================================================
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
/// <summary>
/// Class for creating patches from VersionControlItems
/// </summary>
- public class CreatePatchCommand
+ static class CreatePatchCommand
{
/// <summary>
/// Creates a patch from a VersionControlItemList
@@ -56,7 +56,8 @@ public class CreatePatchCommand
public static bool CreatePatch (VersionControlItemList items, bool test)
{
bool can = CanCreatePatch (items);
- if (test || !can){ return can; }
+ if (test || !can)
+ return can;
FilePath basePath = items.FindMostSpecificParent ();
if (FilePath.Null == basePath)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultBlameViewHandler : IBlameViewHandler
+ sealed class DefaultBlameViewHandler : IBlameViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultDiffViewHandler : IDiffViewHandler
+ sealed class DefaultDiffViewHandler : IDiffViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultLogViewHandler : ILogViewHandler
+ sealed class DefaultLogViewHandler : ILogViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultMergeViewHandler : IMergeViewHandler
+ sealed class DefaultMergeViewHandler : IMergeViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class DiffCommand
+ static class DiffCommand
{
internal static readonly string DiffViewHandlers = "/MonoDevelop/VersionControl/DiffViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- class IgnoreCommand
+ static class IgnoreCommand
{
public static bool Ignore (VersionControlItemList items, bool test)
{
@@ -62,7 +62,7 @@ static bool IgnoreInternal (VersionControlItemList items, bool test)
}
}
- private class IgnoreWorker : Task
+ class IgnoreWorker : Task
{
VersionControlItemList items;
@@ -93,7 +93,7 @@ protected override void Run ()
}
}
- class UnignoreCommand
+ static class UnignoreCommand
{
public static bool Unignore (VersionControlItemList items, bool test)
{
@@ -125,7 +125,7 @@ static bool UnignoreInternal (VersionControlItemList items, bool test)
}
}
- private class UnignoreWorker : Task
+ class UnignoreWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class LockCommand
+ static class LockCommand
{
public static bool Lock (VersionControlItemList items, bool test)
{
@@ -43,7 +43,7 @@ public static bool Lock (VersionControlItemList items, bool test)
return true;
}
- private class LockWorker : Task
+ class LockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class LogCommand
+ static class LogCommand
{
internal static readonly string LogViewHandlers = "/MonoDevelop/VersionControl/LogViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class MergeCommand
+ static class MergeCommand
{
internal static readonly string MergeViewHandlers = "/MonoDevelop/VersionControl/MergeViewHandler";
@@ -42,7 +42,7 @@ static bool CanShow (VersionControlItem item)
&& item.VersionInfo.IsVersioned
&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
}
-
+
public static bool Show (VersionControlItemList items, bool test)
{
if (test)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
===================================================================
@@ -8,7 +8,7 @@
namespace MonoDevelop.VersionControl
{
- internal class PublishCommand
+ static class PublishCommand
{
public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
{
@@ -67,38 +67,38 @@ static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
return true;
return false;
}
- }
-
- internal class PublishWorker : Task {
- Repository vc;
- FilePath path;
- string moduleName;
- FilePath[] files;
- string message;
-
- public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
- {
- this.vc = vc;
- this.path = localPath;
- this.moduleName = moduleName;
- this.files = files;
- this.message = message;
- OperationType = VersionControlOperationType.Push;
- }
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
- }
-
- protected override void Run ()
- {
- vc.Publish (moduleName, path, files, message, Monitor);
- Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
-
- Gtk.Application.Invoke (delegate {
- VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
- });
+ class PublishWorker : Task {
+ Repository vc;
+ FilePath path;
+ string moduleName;
+ FilePath[] files;
+ string message;
+
+ public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
+ {
+ this.vc = vc;
+ this.path = localPath;
+ this.moduleName = moduleName;
+ this.files = files;
+ this.message = message;
+ OperationType = VersionControlOperationType.Push;
+ }
+
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
+ }
+
+ protected override void Run ()
+ {
+ vc.Publish (moduleName, path, files, message, Monitor);
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+
+ Gtk.Application.Invoke (delegate {
+ VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
+ });
+ }
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -29,12 +29,12 @@ public FilePath RootPath
public event EventHandler NameChanged;
- public Repository ()
+ protected Repository ()
{
infoCache = new VersionInfoCache (this);
}
- public Repository (VersionControlSystem vcs): this ()
+ protected Repository (VersionControlSystem vcs): this ()
{
VersionControlSystem = vcs;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class ResolveConflictsCommand
+ static class ResolveConflictsCommand
{
public static bool ResolveConflicts (VersionControlItemList list, bool test)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
===================================================================
@@ -7,9 +7,8 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertCommand
+ static class RevertCommand
{
-
public static bool Revert (VersionControlItemList items, bool test)
{
if (RevertInternal (items, test)) {
@@ -20,7 +19,7 @@ public static bool Revert (VersionControlItemList items, bool test)
return false;
}
- private static bool RevertInternal (VersionControlItemList items, bool test)
+ static bool RevertInternal (VersionControlItemList items, bool test)
{
try {
if (test)
@@ -43,22 +42,22 @@ private static bool RevertInternal (VersionControlItemList items, bool test)
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
VersionControlItemList items;
-
+
public RevertWorker (VersionControlItemList items) {
this.items = items;
}
-
+
protected override string GetDescription() {
return GettextCatalog.GetString ("Reverting ...");
}
-
+
protected override void Run ()
{
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
-
+
Monitor.ReportSuccess (GettextCatalog.GetString ("Revert operation completed."));
Gtk.Application.Invoke (delegate {
foreach (VersionControlItem item in items) {
@@ -74,6 +73,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertRevisionsCommands
+ static class RevertRevisionsCommands
{
public static bool RevertRevision (Repository vc, string path, Revision revision, bool test)
{
@@ -75,7 +75,7 @@ private static bool RevertRevisions (Repository vc, string path, Revision revisi
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
Repository vc;
string path;
Revision revision;
@@ -130,6 +130,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
===================================================================
@@ -6,7 +6,7 @@
namespace MonoDevelop.VersionControl
{
- internal abstract class Task
+ abstract class Task
{
IProgressMonitor tracker;
ThreadNotify threadnotify;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- public class UnknownRepository: Repository, IExtendedDataItem
+ public sealed class UnknownRepository: Repository, IExtendedDataItem
{
Hashtable properties;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
===================================================================
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
{
- public class UnlockCommand
+ static class UnlockCommand
{
public static bool Unlock (VersionControlItemList items, bool test)
{
@@ -45,7 +45,7 @@ public static bool Unlock (VersionControlItemList items, bool test)
return true;
}
- private class UnlockWorker : Task
+ class UnlockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- internal class UpdateCommand
+ static class UpdateCommand
{
public static bool Update (VersionControlItemList items, bool test)
{
@@ -16,7 +16,7 @@ public static bool Update (VersionControlItemList items, bool test)
return true;
}
- private class UpdateWorker : Task {
+ class UpdateWorker : Task {
VersionControlItemList items;
public UpdateWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
@@ -9,11 +9,11 @@ public abstract class UrlBasedRepository: Repository, ICustomDataItem
string url;
Uri uri;
- public UrlBasedRepository ()
+ protected UrlBasedRepository ()
{
}
- public UrlBasedRepository (VersionControlSystem vcs): base (vcs)
+ protected UrlBasedRepository (VersionControlSystem vcs): base (vcs)
{
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionControlConfiguration
+ sealed class VersionControlConfiguration
{
[ItemProperty ("Repositories")]
List<Repository> repositories = new List<Repository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl
{
- internal class VersionControlFileSystemExtension: FileSystemExtension
+ class VersionControlFileSystemExtension: FileSystemExtension
{
public override bool CanHandlePath (FilePath path, bool isDirectory)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItem
+ public sealed class VersionControlItem
{
FilePath path;
bool isDirectory;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItemList: List<VersionControlItem>
+ public sealed class VersionControlItemList: List<VersionControlItem>
{
public VersionControlItemList[] SplitByRepository ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
@@ -251,7 +251,7 @@ internal static string GetPath (object dataObject)
- class AddinCommandHandler : VersionControlCommandHandler
+ sealed class AddinCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (Commands.Update)]
@@ -428,7 +428,7 @@ protected void UpdateResolveConflicts (CommandInfo item)
TestCommand (Commands.ResolveConflicts, item, false);
}
- private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
+ void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
{
TestResult res = RunCommand(cmd, true, projRecurse);
if (res == TestResult.NoVersionControl && cmd == Commands.Log) {
@@ -443,7 +443,7 @@ private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true
item.Visible = res == TestResult.Enable;
}
- private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+ TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
{
VersionControlItemList items = GetItems (projRecurse);
@@ -530,7 +530,7 @@ public override void RefreshItem ()
}
}
- class OpenCommandHandler : VersionControlCommandHandler
+ sealed class OpenCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (ViewCommands.Open)]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
===================================================================
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
{
[PolicyType ("Version control commit message style")]
[DataItem ("VersionControlPolicy")]
- public class VersionControlPolicy: IEquatable<VersionControlPolicy>
+ public sealed class VersionControlPolicy: IEquatable<VersionControlPolicy>
{
public VersionControlPolicy()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlService
+ public static class VersionControlService
{
static Gdk.Pixbuf overlay_modified;
static Gdk.Pixbuf overlay_removed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionInfo
+ public sealed class VersionInfo
{
FilePath localPath;
string repositoryPath;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionInfoCache
+ sealed class VersionInfoCache
{
Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
@@ -137,7 +137,7 @@ public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionIn
}
}
- class DirectoryStatus
+ sealed class DirectoryStatus
{
public VersionInfo[] FileInfo { get; set; }
public bool HasRemoteStatus { get; set; }
Commit: cbc0c989dfa280fd5ba9c7696c28fec924c70ee6
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-21 23:02:56 GMT
URL: https://github.com/mono/monodevelop/commit/cbc0c989dfa280fd5ba9c7696c28fec924c70ee6
[nunit] Call Path.GetFullPath only on dll and exe files
We don't want to call this on all the parameters we pass to
the test runner, like -port=12345 or -xml=somefile.xml
Changed paths:
M main/tests/TestRunner/Runner.cs
Modified: main/tests/TestRunner/Runner.cs
===================================================================
@@ -38,16 +38,16 @@ public class Runer: IApplication
{
public int Run (string[] arguments)
{
- var args = new List<string> (arguments.Select (argument => Path.GetFullPath (argument)));
+ var args = new List<string> (arguments);
bool useGuiUnit = false;
foreach (var ar in args) {
if ((ar.EndsWith (".dll") || ar.EndsWith (".exe")) && File.Exists (ar)) {
try {
- var asm = Assembly.LoadFrom (ar);
+ var asm = Assembly.LoadFrom (Path.GetFullPath (ar));
HashSet<string> ids = new HashSet<string> ();
foreach (var aname in asm.GetReferencedAssemblies ()) {
if (aname.Name == "GuiUnit") {
- Assembly.LoadFile (Path.Combine (Path.GetDirectoryName (ar), "GuiUnit.exe"));
+ Assembly.LoadFile (Path.Combine (Path.GetDirectoryName (Path.GetFullPath (ar)), "GuiUnit.exe"));
useGuiUnit = true;
}
ids.UnionWith (GetAddinsFromReferences (aname));
Commit: 0dd47a18fcf67fb3112a9cf5452b724a9d5f2279
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-22 04:25:33 GMT
URL: https://github.com/mono/monodevelop/commit/0dd47a18fcf67fb3112a9cf5452b724a9d5f2279
Fixed 'Bug 15565 - Wrong context for Type.GetType'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit ad45f0292f393a7586137df9df132b1e9738cc91
+Subproject commit 47681853e56a9e63685e0cc960e4a290d8e4b7be
Commit: 5e2ddb7cf53308ef1617ce605f2086ce9e505ce9
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-22 04:55:01 GMT
URL: https://github.com/mono/monodevelop/commit/5e2ddb7cf53308ef1617ce605f2086ce9e505ce9
Fixed 'Bug 15497 - Incorrect redundant type cast warning'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 47681853e56a9e63685e0cc960e4a290d8e4b7be
+Subproject commit 6f952123fd022b70247aa514a879196d4cd36998
Commit: 2b40cf4b67e51c713e0d75829d7cebea206029e8
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-22 05:07:51 GMT
URL: https://github.com/mono/monodevelop/commit/2b40cf4b67e51c713e0d75829d7cebea206029e8
Fixed 'Fixed 'Bug 15497 - Incorrect redundant type cast warning'.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 6f952123fd022b70247aa514a879196d4cd36998
+Subproject commit 485b6c51f369c9ad7efbf97321a83fc45499d4ac
Commit: a618106ee7dc842e5f797a44f1c7ceaa2aa3f8dc
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-22 05:24:32 GMT
URL: https://github.com/mono/monodevelop/commit/a618106ee7dc842e5f797a44f1c7ceaa2aa3f8dc
Fixed 'Bug 15550 - Inheritance completion'
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 485b6c51f369c9ad7efbf97321a83fc45499d4ac
+Subproject commit f0323dda60817169e7ac815c288a8dea47f5051d
Commit: 37631de0d9d6df72bdd34fa17768d466c603a8b9
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-22 10:39:51 GMT
URL: https://github.com/mono/monodevelop/commit/37631de0d9d6df72bdd34fa17768d466c603a8b9
[TestRunner] Cleanup in Runner.cs
Changed paths:
M main/tests/TestRunner/Runner.cs
Modified: main/tests/TestRunner/Runner.cs
===================================================================
@@ -41,20 +41,21 @@ public int Run (string[] arguments)
var args = new List<string> (arguments);
bool useGuiUnit = false;
foreach (var ar in args) {
- if ((ar.EndsWith (".dll") || ar.EndsWith (".exe")) && File.Exists (ar)) {
+ if ((ar.EndsWith (".dll", StringComparison.Ordinal) || ar.EndsWith (".exe", StringComparison.Ordinal)) && File.Exists (ar)) {
try {
- var asm = Assembly.LoadFrom (Path.GetFullPath (ar));
- HashSet<string> ids = new HashSet<string> ();
+ var path = Path.GetFullPath (ar);
+ var asm = Assembly.LoadFrom (path);
+ var ids = new HashSet<string> ();
foreach (var aname in asm.GetReferencedAssemblies ()) {
if (aname.Name == "GuiUnit") {
- Assembly.LoadFile (Path.Combine (Path.GetDirectoryName (Path.GetFullPath (ar)), "GuiUnit.exe"));
+ Assembly.LoadFile (Path.Combine (Path.GetDirectoryName (path), "GuiUnit.exe"));
useGuiUnit = true;
}
ids.UnionWith (GetAddinsFromReferences (aname));
}
foreach (var id in ids)
- AddinManager.LoadAddin (new Mono.Addins.ConsoleProgressStatus (false), id);
+ AddinManager.LoadAddin (new ConsoleProgressStatus (false), id);
} catch (Exception ex) {
Console.WriteLine (ex);
@@ -64,15 +65,14 @@ public int Run (string[] arguments)
if (useGuiUnit) {
var runnerType = Type.GetType ("GuiUnit.TestRunner, GuiUnit");
var method = runnerType.GetMethod ("Main", BindingFlags.Public | BindingFlags.Static);
- return (int) method.Invoke (null, new [] { args.ToArray () });
- } else {
- args.RemoveAll (a => a.StartsWith ("-port="));
- args.Add ("-domain=None");
- return NUnit.ConsoleRunner.Runner.Main (args.ToArray ());
+ return (int)method.Invoke (null, new [] { args.ToArray () });
}
+ args.RemoveAll (a => a.StartsWith ("-port=", StringComparison.Ordinal));
+ args.Add ("-domain=None");
+ return NUnit.ConsoleRunner.Runner.Main (args.ToArray ());
}
- IEnumerable<string> GetAddinsFromReferences (AssemblyName aname)
+ static IEnumerable<string> GetAddinsFromReferences (AssemblyName aname)
{
foreach (var adn in AddinManager.Registry.GetAddins ().Union (AddinManager.Registry.GetAddinRoots ())) {
foreach (ModuleDescription m in adn.Description.AllModules) {
Commit: e55e1537dd3bb7dae9483913cced329de76d9b27
Author: lluis <[email protected]> (slluis)
Date: 2013-10-22 13:14:54 GMT
URL: https://github.com/mono/monodevelop/commit/e55e1537dd3bb7dae9483913cced329de76d9b27
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 6800aa6ec6363805e012b8c882c4a2fd6f64d73f
+Subproject commit 5a249be65965b6151513ae8820c8d4574f6a2514
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]=92f4763a27236de5b012708e8fa3511b1034e499
+DEP_NEEDED_VERSION[0]=6c675a1596cba8a20263cc997d8f7f1509031e50
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 3da143671a5cbcd152bf456f2488cbe5cc96926c
Author: lluis <[email protected]> (slluis)
Date: 2013-10-22 13:20:23 GMT
URL: https://github.com/mono/monodevelop/commit/3da143671a5cbcd152bf456f2488cbe5cc96926c
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit c0fb2787ba440f15c90e59b8c3b5bf2c9274b561
+Subproject commit 5a249be65965b6151513ae8820c8d4574f6a2514
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]=01f90f9be813c2638fa91cbd074896b0734cfcb3
+DEP_NEEDED_VERSION[0]=d4558cde35ea543a99774ce0773406444c6f459b
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 8193ba6eb392f3c25d18418295196719175f9d0c
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-22 14:42:55 GMT
URL: https://github.com/mono/monodevelop/commit/8193ba6eb392f3c25d18418295196719175f9d0c
bumped debugger-libs
Changed paths:
M main/external/debugger-libs
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit 6dea7fa5220567b97b421143c3145aff68ed2667
+Subproject commit 08d29333ae7e5a032e5024e95545b27ad083f4ed
Commit: b0c1cf71aa9b0f28cab7493350f121dfb432816f
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-22 15:31:48 GMT
URL: https://github.com/mono/monodevelop/commit/b0c1cf71aa9b0f28cab7493350f121dfb432816f
[Core] Only send to Raygun when we're not in debug mode.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -50,7 +50,7 @@ public static class LoggingService
public static readonly FilePath CrashLogDirectory = UserProfile.Current.LogDir.Combine ("LogAgent");
- static RaygunClient raygunClient;
+ static RaygunClient raygunClient = null;
static List<ILogger> loggers = new List<ILogger> ();
static RemoteLogger remoteLogger;
static DateTime timestamp;
@@ -100,10 +100,12 @@ static LoggingService ()
timestamp = DateTime.Now;
+#if !DEBUG
string raygunKey = BrandingService.GetString ("RaygunApiKey");
if (raygunKey != null) {
raygunClient = new RaygunClient (raygunKey);
}
+#endif
//remove the default trace listener on .NET, it throws up horrible dialog boxes for asserts
System.Diagnostics.Debug.Listeners.Clear ();
Commit: 58248785ba24feb45306891d129c096611430f8b
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-22 15:31:56 GMT
URL: https://github.com/mono/monodevelop/commit/58248785ba24feb45306891d129c096611430f8b
[Core] Add ENABLE_RAYGUN constant.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
===================================================================
@@ -12,6 +12,9 @@
<BuildInfo>..\..\..\build\bin\buildinfo</BuildInfo>
<VcRevision>..\..\..\vcrevision</VcRevision>
</PropertyGroup>
+ <PropertyGroup Condition="'$(BUILD_REVISION)' != ''">
+ <DefineConstants>$(DefineConstants);ENABLE_RAYGUN</DefineConstants>
+ </PropertyGroup>
<Choose>
<When Condition=" Exists('c:\Program Files\Git\bin\git.exe') ">
<PropertyGroup>
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -100,7 +100,7 @@ static LoggingService ()
timestamp = DateTime.Now;
-#if !DEBUG
+#if ENABLE_RAYGUN
string raygunKey = BrandingService.GetString ("RaygunApiKey");
if (raygunKey != null) {
raygunClient = new RaygunClient (raygunKey);
Commit: 57f37fc3c6ea2d8efa8184fb38282d3cb1a146db
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-22 15:32:04 GMT
URL: https://github.com/mono/monodevelop/commit/57f37fc3c6ea2d8efa8184fb38282d3cb1a146db
Add environment variables section to README.
Changed paths:
M README
Modified: README
===================================================================
@@ -77,7 +77,14 @@ Dependencies
Gtk# >= 2.12.8
monodoc >= 1.0
mono-addins >= 0.6
-
+
+Special Environment Variables
+-----------------------------
+
+BUILD_REVISION
+ If this environment variable exists we assume we are compiling inside wrench
+
+
References
----------
Commit: f8867e3f3acfe082eec823898e65c454d27d3c7a
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-22 15:32:17 GMT
URL: https://github.com/mono/monodevelop/commit/f8867e3f3acfe082eec823898e65c454d27d3c7a
[Core] Specify the version to Raygun rather than let it use the assembly version.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -196,7 +196,7 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown,
if (raygunClient != null) {
ThreadPool.QueueUserWorkItem (delegate {
- raygunClient.Send (ex, tags);
+ raygunClient.Send (ex, tags, BuildInfo.Version);
});
}
Commit: 9f46237afc73a13df88109e0bd56d14c24ac92b5
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-22 15:32:29 GMT
URL: https://github.com/mono/monodevelop/commit/9f46237afc73a13df88109e0bd56d14c24ac92b5
[Core] Send full system information to Raygun in a custom data attribute.
Changed paths:
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -27,6 +27,7 @@
//
using System;
+using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
@@ -194,9 +195,12 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown,
data = stream.ToArray ();
}
+ var customData = new Hashtable ();
+ customData["SystemInformation"] = SystemInformation.GetTextDescription ();
+
if (raygunClient != null) {
ThreadPool.QueueUserWorkItem (delegate {
- raygunClient.Send (ex, tags, BuildInfo.Version);
+ raygunClient.Send (ex, tags, customData, BuildInfo.Version);
});
}
Commit: c8f00833d2a3bda717568197253f5e6f9f1568f1
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-22 15:36:38 GMT
URL: https://github.com/mono/monodevelop/commit/c8f00833d2a3bda717568197253f5e6f9f1568f1
bumped debugger-libs
Changed paths:
M main/external/debugger-libs
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit 08d29333ae7e5a032e5024e95545b27ad083f4ed
+Subproject commit 5b6a5194b9b84f0395ce03d4fa7c594f43d0b2d1
Commit: 703e63cbe76d57818c33564f02f6eed22c94cb80
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-22 21:09:08 GMT
URL: https://github.com/mono/monodevelop/commit/703e63cbe76d57818c33564f02f6eed22c94cb80
Revert "[Debugger] Set DebugValueWindow's TypeHint to Tooltip to fix focus issue."
This reverts commit 26c94b2b3d68f73a7476447d81346acee687ff2e.
This breaks editing values on Mac.
Changed paths:
M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
===================================================================
@@ -70,10 +70,10 @@ public class DebugValueWindow : PopoverWindow
ScrolledWindow sw;
// PinWindow pinWindow;
// TreeIter currentPinIter;
-
+
public DebugValueWindow (Mono.TextEditor.TextEditor editor, int offset, StackFrame frame, ObjectValue value, PinnedWatch watch): base (Gtk.WindowType.Toplevel)
{
- this.TypeHint = WindowTypeHint.Tooltip;
+ this.TypeHint = WindowTypeHint.PopupMenu;
this.AllowShrink = false;
this.AllowGrow = false;
this.Decorated = false;
Commit: 1ad55564c3c489e725a83732b7dbb00d54929f5e
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-23 02:32:47 GMT
URL: https://github.com/mono/monodevelop/commit/1ad55564c3c489e725a83732b7dbb00d54929f5e
[VersionControl] Never invoke VCS queries with the lock held
The purpose of this lock is purely to provide threadsafe access
to the collections holding the version control queries. We should
not execute any query with that lock held as that will result in
the IDE hanging until it has completely executed all VCS queries
in the current batch.
I kept the current intent of the code while respecting the semanatics
of the lock by duplicating the collections while the lock was held.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -292,23 +292,37 @@ void RunQueries (object ob)
// DateTime t = DateTime.Now;
// Console.WriteLine ("RunQueries started");
try {
- lock (queryLock) {
- var groups = fileQueryQueue.GroupBy (q => (q.QueryFlags & VersionInfoQueryFlags.IncludeRemoteStatus) != 0);
+ while (true) {
+ VersionInfoQuery [] fileQueryQueueClone;
+ DirectoryInfoQuery [] directoryQueryQueueClone;
+
+ lock (queryLock) {
+ if (fileQueryQueue.Count == 0 && directoryQueryQueue.Count == 0) {
+ queryRunning = false;
+ return;
+ }
+
+ fileQueryQueueClone = fileQueryQueue.ToArray ();
+ fileQueryQueue.Clear ();
+ filesInQueryQueue.Clear ();
+
+ directoryQueryQueueClone = directoryQueryQueue.ToArray ();
+ directoriesInQueryQueue.Clear ();
+ directoryQueryQueue.Clear ();
+ }
+
+ // Ensure we do not execute this with the query lock held, otherwise the IDE can hang while trying to add
+ // new queries to the queue while long-running VCS operations are being performed
+ var groups = fileQueryQueueClone.GroupBy (q => (q.QueryFlags & VersionInfoQueryFlags.IncludeRemoteStatus) != 0);
foreach (var group in groups) {
var status = OnGetVersionInfo (group.SelectMany (q => q.Paths), group.Key);
infoCache.SetStatus (status);
}
- filesInQueryQueue.Clear ();
- foreach (var item in directoryQueryQueue) {
+ foreach (var item in directoryQueryQueueClone) {
var status = OnGetDirectoryVersionInfo (item.Directory, item.GetRemoteStatus, false);
infoCache.SetDirectoryStatus (item.Directory, status, item.GetRemoteStatus);
}
- directoriesInQueryQueue.Clear ();
-
- fileQueryQueue.Clear ();
- directoryQueryQueue.Clear ();
- queryRunning = false;
}
} catch (Exception ex) {
LoggingService.LogError ("Version control status query failed", ex);
Commit: 5082d005ef1a51dfe4957af31c92cf9c269a85da
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-23 03:35:55 GMT
URL: https://github.com/mono/monodevelop/commit/5082d005ef1a51dfe4957af31c92cf9c269a85da
Fixed 'Bug 15596 - Hang in VS status area '.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
===================================================================
@@ -77,7 +77,9 @@ public void AllocateArea (TextArea textArea, Gdk.Rectangle allocation)
if (textArea.Allocation != allocation)
textArea.SizeAllocate (allocation);
SetSizeRequest (allocation.Width, (int)editor.LineHeight);
- editor.MoveTopLevelWidget (this, 0, allocation.Height);
+ var pos = ((TextEditor.EditorContainerChild)editor [this]);
+ if (pos.X != 0 && pos.Y != allocation.Height)
+ editor.MoveTopLevelWidget (this, 0, allocation.Height);
}
public bool ShowCaret {
Commit: 03bbbdf256bce54112b677c94376d7ec67928713
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-23 09:55:49 GMT
URL: https://github.com/mono/monodevelop/commit/03bbbdf256bce54112b677c94376d7ec67928713
[CorDebug] Fixed binding of exceptions.
Changed paths:
M main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs
Modified: main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/CorDebuggerSession.cs
===================================================================
@@ -655,10 +655,10 @@ protected override BreakEventInfo OnInsertBreakEvent (BreakEvent be)
{
return MtaThread.Run (delegate
{
- BreakEventInfo binfo = new BreakEventInfo ();
+ var binfo = new BreakEventInfo ();
lock (documents) {
- Breakpoint bp = be as Breakpoint;
+ var bp = be as Breakpoint;
if (bp != null) {
if (bp is FunctionBreakpoint) {
// FIXME: implement breaking on function name
@@ -709,6 +709,20 @@ protected override BreakEventInfo OnInsertBreakEvent (BreakEvent be)
return binfo;
}
}
+
+ var cp = be as Catchpoint;
+ if (cp != null) {
+ foreach (ModuleInfo mod in modules.Values) {
+ CorMetadataImport mi = mod.Importer;
+ if (mi != null) {
+ foreach (Type t in mi.DefinedTypes)
+ if (t.FullName == cp.ExceptionName) {
+ binfo.SetStatus (BreakEventStatus.Bound, null);
+ return binfo;
+ }
+ }
+ }
+ }
}
binfo.SetStatus (BreakEventStatus.Invalid, null);
Commit: e8fdedb643e429aeeb1308c56cee67e098234f0c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-23 12:25:11 GMT
URL: https://github.com/mono/monodevelop/commit/e8fdedb643e429aeeb1308c56cee67e098234f0c
[TextEditor] Fixed vi status area.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViStatusArea.cs
===================================================================
@@ -78,7 +78,7 @@ public void AllocateArea (TextArea textArea, Gdk.Rectangle allocation)
textArea.SizeAllocate (allocation);
SetSizeRequest (allocation.Width, (int)editor.LineHeight);
var pos = ((TextEditor.EditorContainerChild)editor [this]);
- if (pos.X != 0 && pos.Y != allocation.Height)
+ if (pos.X != 0 || pos.Y != allocation.Height)
editor.MoveTopLevelWidget (this, 0, allocation.Height);
}
Commit: 51e63ecc9649a9ce83b83cd70e4b81067a3767ff
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-23 19:22:48 GMT
URL: https://github.com/mono/monodevelop/commit/51e63ecc9649a9ce83b83cd70e4b81067a3767ff
bumped version-checks for 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]=d4558cde35ea543a99774ce0773406444c6f459b
+DEP_NEEDED_VERSION[0]=c317ceea24028a5405e86358afa7a79bd1e2d795
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 25486eded491665ae6221debd39538e8648adcdf
Author: Cody Russell <[email protected]> (bratsche)
Date: 2013-10-23 22:38:23 GMT
URL: https://github.com/mono/monodevelop/commit/25486eded491665ae6221debd39538e8648adcdf
When determining if there is a non-GTK modal window running, we can't just
assume that any NSWindow that is not associated with a GtkWindow is a
modal window. On Mavericks when we go into fullscreen mode we get an
NSStatusBarWindow in the list which is not associated with a GtkWindow, so
we must now check for that.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=14469
Changed paths:
M main/src/addins/MacPlatform/MacPlatform.cs
Modified: main/src/addins/MacPlatform/MacPlatform.cs
===================================================================
@@ -686,7 +686,9 @@ public override void SetIsFullscreen (Gtk.Window window, bool isFullscreen)
public override bool IsModalDialogRunning ()
{
- return GtkQuartz.GetToplevels ().Any (t => t.Key.IsVisible && (t.Value == null || t.Value.Modal));
+ var toplevels = GtkQuartz.GetToplevels ();
+
+ return toplevels.Any (t => t.Key.IsVisible && (t.Value == null || t.Value.Modal) && !t.Key.DebugDescription.StartsWith("<NSStatusBarWindow"));
}
}
}
Commit: 9e905faa6b92fde2b459f4dda1c64d471b974145
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-24 00:19:28 GMT
URL: https://github.com/mono/monodevelop/commit/9e905faa6b92fde2b459f4dda1c64d471b974145
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]=c317ceea24028a5405e86358afa7a79bd1e2d795
+DEP_NEEDED_VERSION[0]=56bd5ed124caa9e066c27f4e8c7da665fc4a51eb
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: cc374c08f0b0d2e5cc81880ad36145f21b4efcc9
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 04:07:40 GMT
URL: https://github.com/mono/monodevelop/commit/cc374c08f0b0d2e5cc81880ad36145f21b4efcc9
Bump md-addins and gui-unit
Changed paths:
M main/external/guiunit
M version-checks
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit aaf2b9650baad6c5c9f06f5f431958803f386135
+Subproject commit 835c9675aa5eaaca284175608a03eb81ad499086
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]=6c675a1596cba8a20263cc997d8f7f1509031e50
+DEP_NEEDED_VERSION[0]=ea33753d2cd8d38037129432d62bf90c69676e61
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 53a7590210b61f597a9d04efd405e568bd7666c4
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 04:08:54 GMT
URL: https://github.com/mono/monodevelop/commit/53a7590210b61f597a9d04efd405e568bd7666c4
bump md-addins to the right commit
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]=ea33753d2cd8d38037129432d62bf90c69676e61
+DEP_NEEDED_VERSION[0]=891c9fc2bf33866f80bf5afd43f16710f211ddd7
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 6fbadae887ad0a62c52dd94effa285572cd219e5
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 04:16:33 GMT
URL: https://github.com/mono/monodevelop/commit/6fbadae887ad0a62c52dd94effa285572cd219e5
[NUnit] Don't assume that automatic updates always work
Only guiunit can give automatic updates, regardless of whether mdtool
is used or not. As such, even if we think automatic updates might
work we should protect against the case where they do not by loading
up the xml file at the end if automatic updates have not been received.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=15477
Changed paths:
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
M main/src/addins/NUnit/Services/TcpTestListener.cs
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -465,6 +465,7 @@ UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test,
LocalConsole cons = new LocalConsole ();
try {
+ MonoDevelop.NUnit.External.TcpTestListener tcpListener = null;
LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null);
if (!string.IsNullOrEmpty (cmd.Arguments))
@@ -477,20 +478,28 @@ UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test,
else if (!string.IsNullOrEmpty (suiteName))
cmd.Arguments += " -run=" + suiteName;
if (automaticUpdates) {
- var tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
+ tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
cmd.Arguments += " -port=" + tcpListener.Port;
}
- var p = testContext.ExecutionContext.Execute (cmd, cons);
- testContext.Monitor.CancelRequested += p.Cancel;
- if (testContext.Monitor.IsCancelRequested)
- p.Cancel ();
- p.WaitForCompleted ();
-
- if (new FileInfo (outFile).Length == 0)
- throw new Exception ("Command failed");
+ // Note that we always dispose the tcp listener as we don't want it listening
+ // forever if the test runner does not try to connect to it
+ using (tcpListener) {
+ var p = testContext.ExecutionContext.Execute (cmd, cons);
- if (automaticUpdates) {
+ testContext.Monitor.CancelRequested += p.Cancel;
+ if (testContext.Monitor.IsCancelRequested)
+ p.Cancel ();
+ p.WaitForCompleted ();
+
+ if (new FileInfo (outFile).Length == 0)
+ throw new Exception ("Command failed");
+ }
+
+ // mdtool.exe does not necessarily guarantee we get automatic updates. It just guarantees
+ // that if guiunit is being used then it will give us updates. If you have a regular test
+ // assembly compiled against nunit.framework.dll
+ if (automaticUpdates && tcpListener.HasReceivedConnection) {
if (testName != null)
return localMonitor.SingleTestResult;
return test.GetLastResult ();
Modified: main/src/addins/NUnit/Services/TcpTestListener.cs
===================================================================
@@ -38,11 +38,15 @@
namespace MonoDevelop.NUnit.External
{
- class TcpTestListener
+ class TcpTestListener : IDisposable
{
string testSuiteName;
string rootTestName;
+ public bool HasReceivedConnection {
+ get; private set;
+ }
+
List<Tuple<string,UnitTestResult>> suiteStack = new List<Tuple<string, UnitTestResult>> ();
IRemoteEventListener listener;
@@ -120,6 +124,11 @@ public TcpTestListener (IRemoteEventListener listener, string suiteName)
});
}
+ public void Dispose ()
+ {
+ TcpListener.Stop ();
+ }
+
void UpdateTestSuiteStatus (string name, bool isTest)
{
if (testSuiteName.Length > 0)
Commit: 061f8c79d6066c8d2e0f23ed42171154b7a1e47d
Author: alan <[email protected]>
Date: 2013-10-24 04:46:07 GMT
URL: https://github.com/mono/monodevelop/commit/061f8c79d6066c8d2e0f23ed42171154b7a1e47d
[NUnit] Use the pathname
The pathname is the correct thing to use, not the suitename
and testname.
The pathname handles tests subclassing other tests in the correct manner
Changed paths:
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -472,11 +472,9 @@ 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"));
- if (!string.IsNullOrEmpty (testName))
- cmd.Arguments += " -run=" + suiteName + "." + testName;
- else if (!string.IsNullOrEmpty (suiteName))
- cmd.Arguments += " -run=" + suiteName;
+ 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;
if (automaticUpdates) {
tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
cmd.Arguments += " -port=" + tcpListener.Port;
Commit: b39f68fa0056f6c9d02b8fcb39a003799af7e401
Author: alan <[email protected]>
Date: 2013-10-24 04:46:08 GMT
URL: https://github.com/mono/monodevelop/commit/b39f68fa0056f6c9d02b8fcb39a003799af7e401
[NUnit] Ignore casing when comparing extensions
Changed paths:
M main/tests/TestRunner/Runner.cs
Modified: main/tests/TestRunner/Runner.cs
===================================================================
@@ -30,18 +30,19 @@
using System.Collections.Generic;
using Mono.Addins;
using System.Linq;
-using Mono.Addins.Description;
+using Mono.Addins.Description;
+using System.Diagnostics;
namespace MonoDevelop.Tests.TestRunner
{
public class Runer: IApplication
{
public int Run (string[] arguments)
- {
+ {
var args = new List<string> (arguments);
bool useGuiUnit = false;
foreach (var ar in args) {
- if ((ar.EndsWith (".dll", StringComparison.Ordinal) || ar.EndsWith (".exe", StringComparison.Ordinal)) && File.Exists (ar)) {
+ if ((ar.EndsWith (".dll", StringComparison.OrdinalIgnoreCase) || ar.EndsWith (".exe", StringComparison.OrdinalIgnoreCase)) && File.Exists (ar)) {
try {
var path = Path.GetFullPath (ar);
var asm = Assembly.LoadFrom (path);
Commit: 5837332ce23918cf1dc2862371c9508cddfdea4c
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 05:22:29 GMT
URL: https://github.com/mono/monodevelop/commit/5837332ce23918cf1dc2862371c9508cddfdea4c
[NUnit] GuiUnit as a project reference now works
I figured out a way to get the output filename for GuiUnit.exe
so i can now give that as the custom command when no other custom
command is supplied.
This means that both a direct binary reference on guiunit.exe and
also a project reference on it's csproj both result in your test
assembly being run using guiunit.exe
Changed paths:
M main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
Modified: main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
===================================================================
@@ -64,7 +64,7 @@ public NUnitProjectTestSuite (DotNetProject project): base (project.Name, projec
public static NUnitProjectTestSuite CreateTest (DotNetProject project)
{
foreach (var p in project.References)
- if (p.Reference.IndexOf ("GuiUnit") != -1 || p.Reference.IndexOf ("nunit.framework") != -1 || p.Reference.IndexOf ("nunit.core") != -1)
+ if (p.Reference.IndexOf ("GuiUnit", StringComparison.OrdinalIgnoreCase) != -1 || p.Reference.IndexOf ("nunit.framework") != -1 || p.Reference.IndexOf ("nunit.core") != -1)
return new NUnitProjectTestSuite (project);
return null;
}
@@ -134,10 +134,17 @@ public override void GetCustomConsoleRunner (out string command, out string args
command = r != null ? project.BaseDirectory.Combine (r.ToString ()).ToString () : null;
args = (string)project.ExtendedProperties ["TestRunnerArgs"];
if (command == null && args == null) {
- var guiUnit = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Assembly && Path.GetFileName (pref.Reference) == "GuiUnit.exe");
+ var guiUnit = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Assembly && StringComparer.OrdinalIgnoreCase.Equals (Path.GetFileName (pref.Reference), "GuiUnit.exe"));
if (guiUnit != null) {
command = guiUnit.Reference;
}
+
+ var projectReference = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Project && pref.Reference.StartsWith ("GuiUnit", StringComparison.OrdinalIgnoreCase));
+ if (IdeApp.IsInitialized && command == null && projectReference != null) {
+ var guiUnitProject = IdeApp.Workspace.GetAllProjects ().First (f => f.Name == projectReference.Reference);
+ if (guiUnitProject != null)
+ command = guiUnitProject.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
+ }
}
}
Commit: 3ceed28b8a851e2d194e7b86aa249da45b18d150
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-24 05:56:01 GMT
URL: https://github.com/mono/monodevelop/commit/3ceed28b8a851e2d194e7b86aa249da45b18d150
Fixed 'Bug 15435 - Printing problem'.
Printing doesn't seem to work on windows without the [STAThread]
attribute.
Changed paths:
M main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
Modified: main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
===================================================================
@@ -24,10 +24,12 @@
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAs" />
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAll" />
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.ReloadFile" />
- <SeparatorItem id = "SaveSeparator" />
- <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" />
- <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPreviewDocument" />
- <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" />
+ <Condition id="Platform" value="!windows">
+ <SeparatorItem id = "SaveSeparator" />
+ <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" />
+ <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPreviewDocument" />
+ <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" />
+ </Condition>
<SeparatorItem id = "RecentSeparator" />
<ItemSet id = "RecentFiles" _label = "Recent _Files">
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.RecentFileList" />
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
===================================================================
@@ -217,6 +217,9 @@ protected override void Update (CommandInfo info)
internal static bool CanPrint ()
{
+ if (Platform.IsWindows)
+ return false;
+
IPrintable print;
return IdeApp.Workbench.ActiveDocument != null
&& (print = IdeApp.Workbench.ActiveDocument.GetContent<IPrintable> ()) != null
Commit: e1fe801bca73e16702daedc1b39158d4962b08c3
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-24 07:22:23 GMT
URL: https://github.com/mono/monodevelop/commit/e1fe801bca73e16702daedc1b39158d4962b08c3
Revert "Fixed 'Bug 15435 - Printing problem'."
This reverts commit 3ceed28b8a851e2d194e7b86aa249da45b18d150.
Changed paths:
M main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
Modified: main/src/core/MonoDevelop.Ide/ExtensionModel/MainMenu.addin.xml
===================================================================
@@ -24,12 +24,10 @@
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAs" />
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.SaveAll" />
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.ReloadFile" />
- <Condition id="Platform" value="!windows">
- <SeparatorItem id = "SaveSeparator" />
- <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" />
- <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPreviewDocument" />
- <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" />
- </Condition>
+ <SeparatorItem id = "SaveSeparator" />
+ <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPageSetup" />
+ <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintPreviewDocument" />
+ <CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.PrintDocument" />
<SeparatorItem id = "RecentSeparator" />
<ItemSet id = "RecentFiles" _label = "Recent _Files">
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.RecentFileList" />
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
===================================================================
@@ -217,9 +217,6 @@ protected override void Update (CommandInfo info)
internal static bool CanPrint ()
{
- if (Platform.IsWindows)
- return false;
-
IPrintable print;
return IdeApp.Workbench.ActiveDocument != null
&& (print = IdeApp.Workbench.ActiveDocument.GetContent<IPrintable> ()) != null
Commit: 3aa45810816177cb3c6cd6e7ec11caf9d6d46686
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-24 09:28:43 GMT
URL: https://github.com/mono/monodevelop/commit/3aa45810816177cb3c6cd6e7ec11caf9d6d46686
Fixed 'Bug 15510 - Monodevelop does not pass project compiler options
to compiler'.
Changed paths:
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
M main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
M main/src/addins/CSharpBinding/gtk-gui/gui.stetic
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
===================================================================
@@ -71,9 +71,6 @@ public class CSharpCompilerParameters: ConfigurationParameters
[ProjectPathItemProperty ("DocumentationFile")]
FilePath documentationFile;
- [ItemProperty ("additionalargs", DefaultValue = "")]
- string additionalArgs = string.Empty;
-
[ItemProperty ("LangVersion", DefaultValue = "Default")]
string langVersion = "Default";
@@ -146,11 +143,7 @@ protected override void OnEndLoad ()
}
}
- public string AdditionalArguments {
- get { return additionalArgs; }
- set { additionalArgs = value ?? string.Empty; }
- }
-
+
public LangVersion LangVersion {
get {
var val = TryLangVersionFromString (langVersion);
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs
===================================================================
@@ -59,7 +59,6 @@ public void Load (DotNetProjectConfiguration configuration)
generateOverflowChecksCheckButton.Active = compilerParameters.GenerateOverflowChecks;
warningsAsErrorsCheckButton.Active = compilerParameters.TreatWarningsAsErrors;
warningLevelSpinButton.Value = compilerParameters.WarningLevel;
- additionalArgsEntry.Text = compilerParameters.AdditionalArguments;
ignoreWarningsEntry.Text = compilerParameters.NoWarnings;
int i = CSharpLanguageBinding.SupportedPlatforms.IndexOf (compilerParameters.PlatformTarget);
@@ -91,7 +90,6 @@ public void Store ()
compilerParameters.GenerateOverflowChecks = generateOverflowChecksCheckButton.Active;
compilerParameters.TreatWarningsAsErrors = warningsAsErrorsCheckButton.Active;
compilerParameters.WarningLevel = warningLevelSpinButton.ValueAsInt;
- compilerParameters.AdditionalArguments = additionalArgsEntry.Text;
compilerParameters.NoWarnings = ignoreWarningsEntry.Text;
compilerParameters.PlatformTarget = CSharpLanguageBinding.SupportedPlatforms [comboPlatforms.Active];
Modified: main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
===================================================================
@@ -313,9 +313,6 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
if (!compilerParameters.DocumentationFile.IsNullOrEmpty)
AppendQuoted (sb, "/doc:", compilerParameters.DocumentationFile);
- if (!string.IsNullOrEmpty (compilerParameters.AdditionalArguments))
- sb.AppendLine (compilerParameters.AdditionalArguments);
-
if (!string.IsNullOrEmpty (compilerParameters.NoWarnings))
AppendQuoted (sb, "/nowarn:", compilerParameters.NoWarnings);
Modified: main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
===================================================================
@@ -1,426 +1,383 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.CSharp.Project
-{
- internal partial class CodeGenerationPanelWidget
- {
- private global::Gtk.VBox vbox62;
- private global::Gtk.Label label82;
- private global::Gtk.HBox hbox56;
- private global::Gtk.Label label81;
- private global::Gtk.VBox vbox65;
- private global::Gtk.Table table1;
- private global::Gtk.CheckButton enableOptimizationCheckButton;
- private global::Gtk.CheckButton generateOverflowChecksCheckButton;
- private global::Gtk.HBox hbox1;
- private global::Gtk.ComboBox comboPlatforms;
- private global::Gtk.HBox hbox2;
- private global::Gtk.ComboBox comboDebug;
- private global::Gtk.HBox hbox4;
- private global::Gtk.CheckButton generateXmlOutputCheckButton;
- private global::MonoDevelop.Components.FileEntry xmlDocsEntry;
- private global::Gtk.Label label1;
- private global::Gtk.Label label2;
- private global::Gtk.Label label87;
- private global::Gtk.Entry symbolsEntry;
- private global::Gtk.Label label93;
- private global::Gtk.HBox hbox48;
- private global::Gtk.Label label73;
- private global::Gtk.VBox vbox67;
- private global::Gtk.HBox hbox60;
- private global::Gtk.Label label85;
- private global::Gtk.SpinButton warningLevelSpinButton;
- private global::Gtk.HBox hbox3;
- private global::Gtk.Label label86;
- private global::Gtk.Entry ignoreWarningsEntry;
- private global::Gtk.CheckButton warningsAsErrorsCheckButton;
- private global::Gtk.Label label94;
- private global::Gtk.HBox hbox5;
- private global::Gtk.Label label74;
- private global::Gtk.HBox hbox6;
- private global::Gtk.Label label88;
- private global::Gtk.Entry additionalArgsEntry;
-
- protected virtual void Build ()
- {
- global::Stetic.Gui.Initialize (this);
- // Widget MonoDevelop.CSharp.Project.CodeGenerationPanelWidget
- global::Stetic.BinContainer.Attach (this);
- this.Name = "MonoDevelop.CSharp.Project.CodeGenerationPanelWidget";
- // Container child MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.Gtk.Container+ContainerChild
- this.vbox62 = new global::Gtk.VBox ();
- this.vbox62.Name = "vbox62";
- this.vbox62.Spacing = 12;
- this.vbox62.BorderWidth = ((uint)(6));
- // Container child vbox62.Gtk.Box+BoxChild
- this.label82 = new global::Gtk.Label ();
- this.label82.Name = "label82";
- this.label82.Xalign = 0F;
- this.label82.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>General Options</b>");
- this.label82.UseMarkup = true;
- this.vbox62.Add (this.label82);
- global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.label82]));
- w1.Position = 0;
- w1.Expand = false;
- w1.Fill = false;
- // Container child vbox62.Gtk.Box+BoxChild
- this.hbox56 = new global::Gtk.HBox ();
- this.hbox56.Name = "hbox56";
- // Container child hbox56.Gtk.Box+BoxChild
- this.label81 = new global::Gtk.Label ();
- this.label81.WidthRequest = 18;
- this.label81.Name = "label81";
- this.hbox56.Add (this.label81);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox56 [this.label81]));
- w2.Position = 0;
- w2.Expand = false;
- w2.Fill = false;
- // Container child hbox56.Gtk.Box+BoxChild
- this.vbox65 = new global::Gtk.VBox ();
- this.vbox65.Name = "vbox65";
- this.vbox65.Spacing = 6;
- // Container child vbox65.Gtk.Box+BoxChild
- this.table1 = new global::Gtk.Table (((uint)(6)), ((uint)(2)), false);
- this.table1.Name = "table1";
- this.table1.RowSpacing = ((uint)(6));
- this.table1.ColumnSpacing = ((uint)(6));
- // Container child table1.Gtk.Table+TableChild
- this.enableOptimizationCheckButton = new global::Gtk.CheckButton ();
- this.enableOptimizationCheckButton.CanFocus = true;
- this.enableOptimizationCheckButton.Name = "enableOptimizationCheckButton";
- this.enableOptimizationCheckButton.Label = global::Mono.Unix.Catalog.GetString ("Enable _optimizations");
- this.enableOptimizationCheckButton.DrawIndicator = true;
- this.enableOptimizationCheckButton.UseUnderline = true;
- this.table1.Add (this.enableOptimizationCheckButton);
- global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.enableOptimizationCheckButton]));
- w3.TopAttach = ((uint)(1));
- w3.BottomAttach = ((uint)(2));
- w3.RightAttach = ((uint)(2));
- w3.XOptions = ((global::Gtk.AttachOptions)(4));
- w3.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.generateOverflowChecksCheckButton = new global::Gtk.CheckButton ();
- this.generateOverflowChecksCheckButton.CanFocus = true;
- this.generateOverflowChecksCheckButton.Name = "generateOverflowChecksCheckButton";
- this.generateOverflowChecksCheckButton.Label = global::Mono.Unix.Catalog.GetString ("_Generate overflow checks");
- this.generateOverflowChecksCheckButton.DrawIndicator = true;
- this.generateOverflowChecksCheckButton.UseUnderline = true;
- this.table1.Add (this.generateOverflowChecksCheckButton);
- global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.generateOverflowChecksCheckButton]));
- w4.RightAttach = ((uint)(2));
- w4.XOptions = ((global::Gtk.AttachOptions)(4));
- w4.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.hbox1 = new global::Gtk.HBox ();
- this.hbox1.Name = "hbox1";
- this.hbox1.Spacing = 6;
- // Container child hbox1.Gtk.Box+BoxChild
- this.comboPlatforms = global::Gtk.ComboBox.NewText ();
- this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("Any CPU"));
- this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("x86"));
- this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("x64"));
- this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("Itanium"));
- this.comboPlatforms.Name = "comboPlatforms";
- this.comboPlatforms.Active = 0;
- this.hbox1.Add (this.comboPlatforms);
- global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboPlatforms]));
- w5.Position = 0;
- w5.Expand = false;
- w5.Fill = false;
- this.table1.Add (this.hbox1);
- global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox1]));
- w6.TopAttach = ((uint)(5));
- w6.BottomAttach = ((uint)(6));
- w6.LeftAttach = ((uint)(1));
- w6.RightAttach = ((uint)(2));
- w6.XOptions = ((global::Gtk.AttachOptions)(4));
- w6.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.hbox2 = new global::Gtk.HBox ();
- this.hbox2.Name = "hbox2";
- this.hbox2.Spacing = 6;
- // Container child hbox2.Gtk.Box+BoxChild
- this.comboDebug = global::Gtk.ComboBox.NewText ();
- this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString ("Full"));
- this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString ("Symbols only"));
- this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString ("None"));
- this.comboDebug.Name = "comboDebug";
- this.comboDebug.Active = 0;
- this.hbox2.Add (this.comboDebug);
- global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboDebug]));
- w7.Position = 0;
- w7.Expand = false;
- w7.Fill = false;
- this.table1.Add (this.hbox2);
- global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2]));
- w8.TopAttach = ((uint)(3));
- w8.BottomAttach = ((uint)(4));
- w8.LeftAttach = ((uint)(1));
- w8.RightAttach = ((uint)(2));
- w8.XOptions = ((global::Gtk.AttachOptions)(4));
- w8.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.hbox4 = new global::Gtk.HBox ();
- this.hbox4.Name = "hbox4";
- this.hbox4.Spacing = 6;
- // Container child hbox4.Gtk.Box+BoxChild
- this.generateXmlOutputCheckButton = new global::Gtk.CheckButton ();
- this.generateXmlOutputCheckButton.CanFocus = true;
- this.generateXmlOutputCheckButton.Name = "generateXmlOutputCheckButton";
- this.generateXmlOutputCheckButton.Label = global::Mono.Unix.Catalog.GetString ("Generate _xml documentation:");
- this.generateXmlOutputCheckButton.DrawIndicator = true;
- this.generateXmlOutputCheckButton.UseUnderline = true;
- this.hbox4.Add (this.generateXmlOutputCheckButton);
- global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.generateXmlOutputCheckButton]));
- w9.Position = 0;
- w9.Expand = false;
- w9.Fill = false;
- // Container child hbox4.Gtk.Box+BoxChild
- this.xmlDocsEntry = new global::MonoDevelop.Components.FileEntry ();
- this.xmlDocsEntry.Name = "xmlDocsEntry";
- this.xmlDocsEntry.DisplayAsRelativePath = false;
- this.hbox4.Add (this.xmlDocsEntry);
- global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.xmlDocsEntry]));
- w10.Position = 1;
- this.table1.Add (this.hbox4);
- global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox4]));
- w11.TopAttach = ((uint)(2));
- w11.BottomAttach = ((uint)(3));
- w11.RightAttach = ((uint)(2));
- w11.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label1 = new global::Gtk.Label ();
- this.label1.Name = "label1";
- this.label1.Xalign = 0F;
- this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Platform target:");
- this.table1.Add (this.label1);
- global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
- w12.TopAttach = ((uint)(5));
- w12.BottomAttach = ((uint)(6));
- w12.XOptions = ((global::Gtk.AttachOptions)(4));
- w12.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label2 = new global::Gtk.Label ();
- this.label2.Name = "label2";
- this.label2.Xalign = 0F;
- this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Debug information:");
- this.table1.Add (this.label2);
- global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
- w13.TopAttach = ((uint)(3));
- w13.BottomAttach = ((uint)(4));
- w13.XOptions = ((global::Gtk.AttachOptions)(4));
- w13.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label87 = new global::Gtk.Label ();
- this.label87.Name = "label87";
- this.label87.Xalign = 0F;
- this.label87.LabelProp = global::Mono.Unix.Catalog.GetString ("Define S_ymbols:");
- this.label87.UseUnderline = true;
- this.table1.Add (this.label87);
- global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label87]));
- w14.TopAttach = ((uint)(4));
- w14.BottomAttach = ((uint)(5));
- w14.XOptions = ((global::Gtk.AttachOptions)(4));
- w14.YOptions = ((global::Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.symbolsEntry = new global::Gtk.Entry ();
- this.symbolsEntry.CanFocus = true;
- this.symbolsEntry.Name = "symbolsEntry";
- this.symbolsEntry.IsEditable = true;
- this.symbolsEntry.InvisibleChar = '●';
- this.table1.Add (this.symbolsEntry);
- global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.symbolsEntry]));
- w15.TopAttach = ((uint)(4));
- w15.BottomAttach = ((uint)(5));
- w15.LeftAttach = ((uint)(1));
- w15.RightAttach = ((uint)(2));
- w15.YOptions = ((global::Gtk.AttachOptions)(4));
- this.vbox65.Add (this.table1);
- global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox65 [this.table1]));
- w16.Position = 0;
- w16.Expand = false;
- w16.Fill = false;
- this.hbox56.Add (this.vbox65);
- global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox56 [this.vbox65]));
- w17.Position = 1;
- this.vbox62.Add (this.hbox56);
- global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.hbox56]));
- w18.Position = 1;
- w18.Expand = false;
- w18.Fill = false;
- // Container child vbox62.Gtk.Box+BoxChild
- this.label93 = new global::Gtk.Label ();
- this.label93.Name = "label93";
- this.label93.Xalign = 0F;
- this.label93.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Warnings</b>");
- this.label93.UseMarkup = true;
- this.label93.UseUnderline = true;
- this.vbox62.Add (this.label93);
- global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.label93]));
- w19.Position = 2;
- w19.Expand = false;
- w19.Fill = false;
- // Container child vbox62.Gtk.Box+BoxChild
- this.hbox48 = new global::Gtk.HBox ();
- this.hbox48.Name = "hbox48";
- // Container child hbox48.Gtk.Box+BoxChild
- this.label73 = new global::Gtk.Label ();
- this.label73.WidthRequest = 18;
- this.label73.Name = "label73";
- this.hbox48.Add (this.label73);
- global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox48 [this.label73]));
- w20.Position = 0;
- w20.Expand = false;
- w20.Fill = false;
- // Container child hbox48.Gtk.Box+BoxChild
- this.vbox67 = new global::Gtk.VBox ();
- this.vbox67.Name = "vbox67";
- this.vbox67.Spacing = 6;
- // Container child vbox67.Gtk.Box+BoxChild
- this.hbox60 = new global::Gtk.HBox ();
- this.hbox60.Name = "hbox60";
- this.hbox60.Spacing = 6;
- // Container child hbox60.Gtk.Box+BoxChild
- this.label85 = new global::Gtk.Label ();
- this.label85.Name = "label85";
- this.label85.LabelProp = global::Mono.Unix.Catalog.GetString ("_Warning Level:");
- this.label85.UseUnderline = true;
- this.hbox60.Add (this.label85);
- global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox60 [this.label85]));
- w21.Position = 0;
- w21.Expand = false;
- w21.Fill = false;
- // Container child hbox60.Gtk.Box+BoxChild
- this.warningLevelSpinButton = new global::Gtk.SpinButton (0D, 4D, 1D);
- this.warningLevelSpinButton.CanFocus = true;
- this.warningLevelSpinButton.Name = "warningLevelSpinButton";
- this.warningLevelSpinButton.Adjustment.PageIncrement = 1D;
- this.warningLevelSpinButton.ClimbRate = 1D;
- this.warningLevelSpinButton.Numeric = true;
- this.warningLevelSpinButton.Value = 2D;
- this.hbox60.Add (this.warningLevelSpinButton);
- global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox60 [this.warningLevelSpinButton]));
- w22.Position = 1;
- w22.Expand = false;
- w22.Fill = false;
- this.vbox67.Add (this.hbox60);
- global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox67 [this.hbox60]));
- w23.Position = 0;
- w23.Expand = false;
- w23.Fill = false;
- // Container child vbox67.Gtk.Box+BoxChild
- this.hbox3 = new global::Gtk.HBox ();
- this.hbox3.Name = "hbox3";
- this.hbox3.Spacing = 6;
- // Container child hbox3.Gtk.Box+BoxChild
- this.label86 = new global::Gtk.Label ();
- this.label86.Name = "label86";
- this.label86.LabelProp = global::Mono.Unix.Catalog.GetString ("_Ignore warnings:");
- this.label86.UseUnderline = true;
- this.hbox3.Add (this.label86);
- global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label86]));
- w24.Position = 0;
- w24.Expand = false;
- w24.Fill = false;
- // Container child hbox3.Gtk.Box+BoxChild
- this.ignoreWarningsEntry = new global::Gtk.Entry ();
- this.ignoreWarningsEntry.CanFocus = true;
- this.ignoreWarningsEntry.Name = "ignoreWarningsEntry";
- this.ignoreWarningsEntry.IsEditable = true;
- this.ignoreWarningsEntry.InvisibleChar = '●';
- this.hbox3.Add (this.ignoreWarningsEntry);
- global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.ignoreWarningsEntry]));
- w25.Position = 1;
- this.vbox67.Add (this.hbox3);
- global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox67 [this.hbox3]));
- w26.Position = 1;
- w26.Expand = false;
- w26.Fill = false;
- // Container child vbox67.Gtk.Box+BoxChild
- this.warningsAsErrorsCheckButton = new global::Gtk.CheckButton ();
- this.warningsAsErrorsCheckButton.CanFocus = true;
- this.warningsAsErrorsCheckButton.Name = "warningsAsErrorsCheckButton";
- this.warningsAsErrorsCheckButton.Label = global::Mono.Unix.Catalog.GetString ("Treat warnings as _errors");
- this.warningsAsErrorsCheckButton.DrawIndicator = true;
- this.warningsAsErrorsCheckButton.UseUnderline = true;
- this.vbox67.Add (this.warningsAsErrorsCheckButton);
- global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox67 [this.warningsAsErrorsCheckButton]));
- w27.Position = 2;
- w27.Expand = false;
- w27.Fill = false;
- this.hbox48.Add (this.vbox67);
- global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox48 [this.vbox67]));
- w28.Position = 1;
- this.vbox62.Add (this.hbox48);
- global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.hbox48]));
- w29.Position = 3;
- w29.Expand = false;
- w29.Fill = false;
- // Container child vbox62.Gtk.Box+BoxChild
- this.label94 = new global::Gtk.Label ();
- this.label94.Name = "label94";
- this.label94.Xalign = 0F;
- this.label94.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Additional Options</b>");
- this.label94.UseMarkup = true;
- this.label94.UseUnderline = true;
- this.vbox62.Add (this.label94);
- global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.label94]));
- w30.Position = 4;
- w30.Expand = false;
- w30.Fill = false;
- // Container child vbox62.Gtk.Box+BoxChild
- this.hbox5 = new global::Gtk.HBox ();
- this.hbox5.Name = "hbox5";
- this.hbox5.Spacing = 6;
- // Container child hbox5.Gtk.Box+BoxChild
- this.label74 = new global::Gtk.Label ();
- this.label74.WidthRequest = 18;
- this.label74.Name = "label74";
- this.hbox5.Add (this.label74);
- global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.label74]));
- w31.Position = 0;
- w31.Expand = false;
- w31.Fill = false;
- // Container child hbox5.Gtk.Box+BoxChild
- this.hbox6 = new global::Gtk.HBox ();
- this.hbox6.Name = "hbox6";
- this.hbox6.Spacing = 6;
- // Container child hbox6.Gtk.Box+BoxChild
- this.label88 = new global::Gtk.Label ();
- this.label88.Name = "label88";
- this.label88.LabelProp = global::Mono.Unix.Catalog.GetString ("_Additional arguments:");
- this.label88.UseUnderline = true;
- this.hbox6.Add (this.label88);
- global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.label88]));
- w32.Position = 0;
- w32.Expand = false;
- w32.Fill = false;
- // Container child hbox6.Gtk.Box+BoxChild
- this.additionalArgsEntry = new global::Gtk.Entry ();
- this.additionalArgsEntry.CanFocus = true;
- this.additionalArgsEntry.Name = "additionalArgsEntry";
- this.additionalArgsEntry.IsEditable = true;
- this.additionalArgsEntry.InvisibleChar = '●';
- this.hbox6.Add (this.additionalArgsEntry);
- global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.additionalArgsEntry]));
- w33.Position = 1;
- this.hbox5.Add (this.hbox6);
- global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.hbox6]));
- w34.Position = 1;
- this.vbox62.Add (this.hbox5);
- global::Gtk.Box.BoxChild w35 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.hbox5]));
- w35.Position = 5;
- w35.Expand = false;
- w35.Fill = false;
- this.Add (this.vbox62);
- if ((this.Child != null)) {
- this.Child.ShowAll ();
- }
- this.label87.MnemonicWidget = this.symbolsEntry;
- this.label85.MnemonicWidget = this.warningLevelSpinButton;
- this.label86.MnemonicWidget = this.warningLevelSpinButton;
- this.label88.MnemonicWidget = this.warningLevelSpinButton;
- this.Show ();
- }
- }
-}
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.CSharp.Project
+{
+ internal partial class CodeGenerationPanelWidget
+ {
+ private global::Gtk.VBox vbox62;
+ private global::Gtk.Label label82;
+ private global::Gtk.HBox hbox56;
+ private global::Gtk.Label label81;
+ private global::Gtk.VBox vbox65;
+ private global::Gtk.Table table1;
+ private global::Gtk.CheckButton enableOptimizationCheckButton;
+ private global::Gtk.CheckButton generateOverflowChecksCheckButton;
+ private global::Gtk.HBox hbox1;
+ private global::Gtk.ComboBox comboPlatforms;
+ private global::Gtk.HBox hbox2;
+ private global::Gtk.ComboBox comboDebug;
+ private global::Gtk.HBox hbox4;
+ private global::Gtk.CheckButton generateXmlOutputCheckButton;
+ private global::MonoDevelop.Components.FileEntry xmlDocsEntry;
+ private global::Gtk.Label label1;
+ private global::Gtk.Label label2;
+ private global::Gtk.Label label87;
+ private global::Gtk.Entry symbolsEntry;
+ private global::Gtk.Label label93;
+ private global::Gtk.HBox hbox48;
+ private global::Gtk.Label label73;
+ private global::Gtk.VBox vbox67;
+ private global::Gtk.HBox hbox60;
+ private global::Gtk.Label label85;
+ private global::Gtk.SpinButton warningLevelSpinButton;
+ private global::Gtk.HBox hbox3;
+ private global::Gtk.Label label86;
+ private global::Gtk.Entry ignoreWarningsEntry;
+ private global::Gtk.CheckButton warningsAsErrorsCheckButton;
+ private global::Gtk.HBox hbox5;
+ private global::Gtk.Label label74;
+
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget MonoDevelop.CSharp.Project.CodeGenerationPanelWidget
+ global::Stetic.BinContainer.Attach (this);
+ this.Name = "MonoDevelop.CSharp.Project.CodeGenerationPanelWidget";
+ // Container child MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.Gtk.Container+ContainerChild
+ this.vbox62 = new global::Gtk.VBox ();
+ this.vbox62.Name = "vbox62";
+ this.vbox62.Spacing = 12;
+ this.vbox62.BorderWidth = ((uint)(6));
+ // Container child vbox62.Gtk.Box+BoxChild
+ this.label82 = new global::Gtk.Label ();
+ this.label82.Name = "label82";
+ this.label82.Xalign = 0F;
+ this.label82.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>General Options</b>");
+ this.label82.UseMarkup = true;
+ this.vbox62.Add (this.label82);
+ global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.label82]));
+ w1.Position = 0;
+ w1.Expand = false;
+ w1.Fill = false;
+ // Container child vbox62.Gtk.Box+BoxChild
+ this.hbox56 = new global::Gtk.HBox ();
+ this.hbox56.Name = "hbox56";
+ // Container child hbox56.Gtk.Box+BoxChild
+ this.label81 = new global::Gtk.Label ();
+ this.label81.WidthRequest = 18;
+ this.label81.Name = "label81";
+ this.hbox56.Add (this.label81);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox56 [this.label81]));
+ w2.Position = 0;
+ w2.Expand = false;
+ w2.Fill = false;
+ // Container child hbox56.Gtk.Box+BoxChild
+ this.vbox65 = new global::Gtk.VBox ();
+ this.vbox65.Name = "vbox65";
+ this.vbox65.Spacing = 6;
+ // Container child vbox65.Gtk.Box+BoxChild
+ this.table1 = new global::Gtk.Table (((uint)(6)), ((uint)(2)), false);
+ this.table1.Name = "table1";
+ this.table1.RowSpacing = ((uint)(6));
+ this.table1.ColumnSpacing = ((uint)(6));
+ // Container child table1.Gtk.Table+TableChild
+ this.enableOptimizationCheckButton = new global::Gtk.CheckButton ();
+ this.enableOptimizationCheckButton.CanFocus = true;
+ this.enableOptimizationCheckButton.Name = "enableOptimizationCheckButton";
+ this.enableOptimizationCheckButton.Label = global::Mono.Unix.Catalog.GetString ("Enable _optimizations");
+ this.enableOptimizationCheckButton.DrawIndicator = true;
+ this.enableOptimizationCheckButton.UseUnderline = true;
+ this.table1.Add (this.enableOptimizationCheckButton);
+ global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.enableOptimizationCheckButton]));
+ w3.TopAttach = ((uint)(1));
+ w3.BottomAttach = ((uint)(2));
+ w3.RightAttach = ((uint)(2));
+ w3.XOptions = ((global::Gtk.AttachOptions)(4));
+ w3.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.generateOverflowChecksCheckButton = new global::Gtk.CheckButton ();
+ this.generateOverflowChecksCheckButton.CanFocus = true;
+ this.generateOverflowChecksCheckButton.Name = "generateOverflowChecksCheckButton";
+ this.generateOverflowChecksCheckButton.Label = global::Mono.Unix.Catalog.GetString ("_Generate overflow checks");
+ this.generateOverflowChecksCheckButton.DrawIndicator = true;
+ this.generateOverflowChecksCheckButton.UseUnderline = true;
+ this.table1.Add (this.generateOverflowChecksCheckButton);
+ global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.generateOverflowChecksCheckButton]));
+ w4.RightAttach = ((uint)(2));
+ w4.XOptions = ((global::Gtk.AttachOptions)(4));
+ w4.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.hbox1 = new global::Gtk.HBox ();
+ this.hbox1.Name = "hbox1";
+ this.hbox1.Spacing = 6;
+ // Container child hbox1.Gtk.Box+BoxChild
+ this.comboPlatforms = global::Gtk.ComboBox.NewText ();
+ this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("Any CPU"));
+ this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("x86"));
+ this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("x64"));
+ this.comboPlatforms.AppendText (global::Mono.Unix.Catalog.GetString ("Itanium"));
+ this.comboPlatforms.Name = "comboPlatforms";
+ this.comboPlatforms.Active = 0;
+ this.hbox1.Add (this.comboPlatforms);
+ global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.comboPlatforms]));
+ w5.Position = 0;
+ w5.Expand = false;
+ w5.Fill = false;
+ this.table1.Add (this.hbox1);
+ global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox1]));
+ w6.TopAttach = ((uint)(5));
+ w6.BottomAttach = ((uint)(6));
+ w6.LeftAttach = ((uint)(1));
+ w6.RightAttach = ((uint)(2));
+ w6.XOptions = ((global::Gtk.AttachOptions)(4));
+ w6.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.hbox2 = new global::Gtk.HBox ();
+ this.hbox2.Name = "hbox2";
+ this.hbox2.Spacing = 6;
+ // Container child hbox2.Gtk.Box+BoxChild
+ this.comboDebug = global::Gtk.ComboBox.NewText ();
+ this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString ("Full"));
+ this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString ("Symbols only"));
+ this.comboDebug.AppendText (global::Mono.Unix.Catalog.GetString ("None"));
+ this.comboDebug.Name = "comboDebug";
+ this.comboDebug.Active = 0;
+ this.hbox2.Add (this.comboDebug);
+ global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboDebug]));
+ w7.Position = 0;
+ w7.Expand = false;
+ w7.Fill = false;
+ this.table1.Add (this.hbox2);
+ global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2]));
+ w8.TopAttach = ((uint)(3));
+ w8.BottomAttach = ((uint)(4));
+ w8.LeftAttach = ((uint)(1));
+ w8.RightAttach = ((uint)(2));
+ w8.XOptions = ((global::Gtk.AttachOptions)(4));
+ w8.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.hbox4 = new global::Gtk.HBox ();
+ this.hbox4.Name = "hbox4";
+ this.hbox4.Spacing = 6;
+ // Container child hbox4.Gtk.Box+BoxChild
+ this.generateXmlOutputCheckButton = new global::Gtk.CheckButton ();
+ this.generateXmlOutputCheckButton.CanFocus = true;
+ this.generateXmlOutputCheckButton.Name = "generateXmlOutputCheckButton";
+ this.generateXmlOutputCheckButton.Label = global::Mono.Unix.Catalog.GetString ("Generate _xml documentation:");
+ this.generateXmlOutputCheckButton.DrawIndicator = true;
+ this.generateXmlOutputCheckButton.UseUnderline = true;
+ this.hbox4.Add (this.generateXmlOutputCheckButton);
+ global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.generateXmlOutputCheckButton]));
+ w9.Position = 0;
+ w9.Expand = false;
+ w9.Fill = false;
+ // Container child hbox4.Gtk.Box+BoxChild
+ this.xmlDocsEntry = new global::MonoDevelop.Components.FileEntry ();
+ this.xmlDocsEntry.Name = "xmlDocsEntry";
+ this.xmlDocsEntry.DisplayAsRelativePath = false;
+ this.hbox4.Add (this.xmlDocsEntry);
+ global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox4 [this.xmlDocsEntry]));
+ w10.Position = 1;
+ this.table1.Add (this.hbox4);
+ global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox4]));
+ w11.TopAttach = ((uint)(2));
+ w11.BottomAttach = ((uint)(3));
+ w11.RightAttach = ((uint)(2));
+ w11.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label1 = new global::Gtk.Label ();
+ this.label1.Name = "label1";
+ this.label1.Xalign = 0F;
+ this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Platform target:");
+ this.table1.Add (this.label1);
+ global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+ w12.TopAttach = ((uint)(5));
+ w12.BottomAttach = ((uint)(6));
+ w12.XOptions = ((global::Gtk.AttachOptions)(4));
+ w12.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label2 = new global::Gtk.Label ();
+ this.label2.Name = "label2";
+ this.label2.Xalign = 0F;
+ this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Debug information:");
+ this.table1.Add (this.label2);
+ global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
+ w13.TopAttach = ((uint)(3));
+ w13.BottomAttach = ((uint)(4));
+ w13.XOptions = ((global::Gtk.AttachOptions)(4));
+ w13.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label87 = new global::Gtk.Label ();
+ this.label87.Name = "label87";
+ this.label87.Xalign = 0F;
+ this.label87.LabelProp = global::Mono.Unix.Catalog.GetString ("Define S_ymbols:");
+ this.label87.UseUnderline = true;
+ this.table1.Add (this.label87);
+ global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label87]));
+ w14.TopAttach = ((uint)(4));
+ w14.BottomAttach = ((uint)(5));
+ w14.XOptions = ((global::Gtk.AttachOptions)(4));
+ w14.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.symbolsEntry = new global::Gtk.Entry ();
+ this.symbolsEntry.CanFocus = true;
+ this.symbolsEntry.Name = "symbolsEntry";
+ this.symbolsEntry.IsEditable = true;
+ this.symbolsEntry.InvisibleChar = '●';
+ this.table1.Add (this.symbolsEntry);
+ global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.symbolsEntry]));
+ w15.TopAttach = ((uint)(4));
+ w15.BottomAttach = ((uint)(5));
+ w15.LeftAttach = ((uint)(1));
+ w15.RightAttach = ((uint)(2));
+ w15.YOptions = ((global::Gtk.AttachOptions)(4));
+ this.vbox65.Add (this.table1);
+ global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox65 [this.table1]));
+ w16.Position = 0;
+ w16.Expand = false;
+ w16.Fill = false;
+ this.hbox56.Add (this.vbox65);
+ global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox56 [this.vbox65]));
+ w17.Position = 1;
+ this.vbox62.Add (this.hbox56);
+ global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.hbox56]));
+ w18.Position = 1;
+ w18.Expand = false;
+ w18.Fill = false;
+ // Container child vbox62.Gtk.Box+BoxChild
+ this.label93 = new global::Gtk.Label ();
+ this.label93.Name = "label93";
+ this.label93.Xalign = 0F;
+ this.label93.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Warnings</b>");
+ this.label93.UseMarkup = true;
+ this.label93.UseUnderline = true;
+ this.vbox62.Add (this.label93);
+ global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.label93]));
+ w19.Position = 2;
+ w19.Expand = false;
+ w19.Fill = false;
+ // Container child vbox62.Gtk.Box+BoxChild
+ this.hbox48 = new global::Gtk.HBox ();
+ this.hbox48.Name = "hbox48";
+ // Container child hbox48.Gtk.Box+BoxChild
+ this.label73 = new global::Gtk.Label ();
+ this.label73.WidthRequest = 18;
+ this.label73.Name = "label73";
+ this.hbox48.Add (this.label73);
+ global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.hbox48 [this.label73]));
+ w20.Position = 0;
+ w20.Expand = false;
+ w20.Fill = false;
+ // Container child hbox48.Gtk.Box+BoxChild
+ this.vbox67 = new global::Gtk.VBox ();
+ this.vbox67.Name = "vbox67";
+ this.vbox67.Spacing = 6;
+ // Container child vbox67.Gtk.Box+BoxChild
+ this.hbox60 = new global::Gtk.HBox ();
+ this.hbox60.Name = "hbox60";
+ this.hbox60.Spacing = 6;
+ // Container child hbox60.Gtk.Box+BoxChild
+ this.label85 = new global::Gtk.Label ();
+ this.label85.Name = "label85";
+ this.label85.LabelProp = global::Mono.Unix.Catalog.GetString ("_Warning Level:");
+ this.label85.UseUnderline = true;
+ this.hbox60.Add (this.label85);
+ global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox60 [this.label85]));
+ w21.Position = 0;
+ w21.Expand = false;
+ w21.Fill = false;
+ // Container child hbox60.Gtk.Box+BoxChild
+ this.warningLevelSpinButton = new global::Gtk.SpinButton (0, 4, 1);
+ this.warningLevelSpinButton.CanFocus = true;
+ this.warningLevelSpinButton.Name = "warningLevelSpinButton";
+ this.warningLevelSpinButton.Adjustment.PageIncrement = 1;
+ this.warningLevelSpinButton.ClimbRate = 1;
+ this.warningLevelSpinButton.Numeric = true;
+ this.warningLevelSpinButton.Value = 2;
+ this.hbox60.Add (this.warningLevelSpinButton);
+ global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.hbox60 [this.warningLevelSpinButton]));
+ w22.Position = 1;
+ w22.Expand = false;
+ w22.Fill = false;
+ this.vbox67.Add (this.hbox60);
+ global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox67 [this.hbox60]));
+ w23.Position = 0;
+ w23.Expand = false;
+ w23.Fill = false;
+ // Container child vbox67.Gtk.Box+BoxChild
+ this.hbox3 = new global::Gtk.HBox ();
+ this.hbox3.Name = "hbox3";
+ this.hbox3.Spacing = 6;
+ // Container child hbox3.Gtk.Box+BoxChild
+ this.label86 = new global::Gtk.Label ();
+ this.label86.Name = "label86";
+ this.label86.LabelProp = global::Mono.Unix.Catalog.GetString ("_Ignore warnings:");
+ this.label86.UseUnderline = true;
+ this.hbox3.Add (this.label86);
+ global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.label86]));
+ w24.Position = 0;
+ w24.Expand = false;
+ w24.Fill = false;
+ // Container child hbox3.Gtk.Box+BoxChild
+ this.ignoreWarningsEntry = new global::Gtk.Entry ();
+ this.ignoreWarningsEntry.CanFocus = true;
+ this.ignoreWarningsEntry.Name = "ignoreWarningsEntry";
+ this.ignoreWarningsEntry.IsEditable = true;
+ this.ignoreWarningsEntry.InvisibleChar = '●';
+ this.hbox3.Add (this.ignoreWarningsEntry);
+ global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.ignoreWarningsEntry]));
+ w25.Position = 1;
+ this.vbox67.Add (this.hbox3);
+ global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox67 [this.hbox3]));
+ w26.Position = 1;
+ w26.Expand = false;
+ w26.Fill = false;
+ // Container child vbox67.Gtk.Box+BoxChild
+ this.warningsAsErrorsCheckButton = new global::Gtk.CheckButton ();
+ this.warningsAsErrorsCheckButton.CanFocus = true;
+ this.warningsAsErrorsCheckButton.Name = "warningsAsErrorsCheckButton";
+ this.warningsAsErrorsCheckButton.Label = global::Mono.Unix.Catalog.GetString ("Treat warnings as _errors");
+ this.warningsAsErrorsCheckButton.DrawIndicator = true;
+ this.warningsAsErrorsCheckButton.UseUnderline = true;
+ this.vbox67.Add (this.warningsAsErrorsCheckButton);
+ global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox67 [this.warningsAsErrorsCheckButton]));
+ w27.Position = 2;
+ w27.Expand = false;
+ w27.Fill = false;
+ this.hbox48.Add (this.vbox67);
+ global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox48 [this.vbox67]));
+ w28.Position = 1;
+ this.vbox62.Add (this.hbox48);
+ global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.hbox48]));
+ w29.Position = 3;
+ w29.Expand = false;
+ w29.Fill = false;
+ // Container child vbox62.Gtk.Box+BoxChild
+ this.hbox5 = new global::Gtk.HBox ();
+ this.hbox5.Name = "hbox5";
+ this.hbox5.Spacing = 6;
+ // Container child hbox5.Gtk.Box+BoxChild
+ this.label74 = new global::Gtk.Label ();
+ this.label74.WidthRequest = 18;
+ this.label74.Name = "label74";
+ this.hbox5.Add (this.label74);
+ global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.label74]));
+ w30.Position = 0;
+ w30.Expand = false;
+ w30.Fill = false;
+ this.vbox62.Add (this.hbox5);
+ global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox62 [this.hbox5]));
+ w31.Position = 4;
+ w31.Expand = false;
+ w31.Fill = false;
+ this.Add (this.vbox62);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.label87.MnemonicWidget = this.symbolsEntry;
+ this.label85.MnemonicWidget = this.warningLevelSpinButton;
+ this.label86.MnemonicWidget = this.warningLevelSpinButton;
+ this.Show ();
+ }
+ }
+}
Modified: main/src/addins/CSharpBinding/gtk-gui/gui.stetic
===================================================================
@@ -7,14 +7,13 @@
<import>
<widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
<widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
- <widget-library name="../../../../build/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll" />
<widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
<widget-library name="../../../../build/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll" />
<widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
<widget-library name="../../../../build/AddIns/NUnit/MonoDevelop.NUnit.dll" />
<widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll" internal="true" />
</import>
- <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Project.CodeGenerationPanelWidget" design-size="428 412">
+ <widget class="Gtk.Bin" id="MonoDevelop.CSharp.Project.CodeGenerationPanelWidget" design-size="428 473">
<property name="MemberName" />
<property name="GeneratePublic">False</property>
<child>
@@ -487,21 +486,6 @@ None</property>
</packing>
</child>
<child>
- <widget class="Gtk.Label" id="label94">
- <property name="MemberName" />
- <property name="Xalign">0</property>
- <property name="LabelProp" translatable="yes"><b>Additional Options</b></property>
- <property name="UseMarkup">True</property>
- <property name="UseUnderline">True</property>
- </widget>
- <packing>
- <property name="Position">4</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
<widget class="Gtk.HBox" id="hbox5">
<property name="MemberName" />
<property name="Spacing">6</property>
@@ -517,45 +501,9 @@ None</property>
<property name="Fill">False</property>
</packing>
</child>
- <child>
- <widget class="Gtk.HBox" id="hbox6">
- <property name="MemberName" />
- <property name="Spacing">6</property>
- <child>
- <widget class="Gtk.Label" id="label88">
- <property name="MemberName" />
- <property name="LabelProp" translatable="yes">_Additional arguments:</property>
- <property name="UseUnderline">True</property>
- <property name="MnemonicWidget">warningLevelSpinButton</property>
- </widget>
- <packing>
- <property name="Position">0</property>
- <property name="AutoSize">True</property>
- <property name="Expand">False</property>
- <property name="Fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="Gtk.Entry" id="additionalArgsEntry">
- <property name="MemberName" />
- <property name="CanFocus">True</property>
- <property name="IsEditable">True</property>
- <property name="InvisibleChar">●</property>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="Position">1</property>
- <property name="AutoSize">True</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="Position">5</property>
+ <property name="Position">4</property>
<property name="AutoSize">True</property>
<property name="Expand">False</property>
<property name="Fill">False</property>
Commit: 3012ba887762ba0111914bca1af4b79f587cdb54
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-24 09:39:52 GMT
URL: https://github.com/mono/monodevelop/commit/3012ba887762ba0111914bca1af4b79f587cdb54
[CSharp.AutoTools] Fix build.
Changed paths:
M main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
Modified: main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
===================================================================
@@ -75,11 +75,7 @@ public string GetCompilerFlags ( Project project, string configuration )
if (!hasDebugDefine)
writer.Write (" -define:DEBUG");
}
-
- if (!string.IsNullOrEmpty (parameters.AdditionalArguments)) {
- writer.Write (" " + parameters.AdditionalArguments + " ");
- }
-
+
switch (parameters.LangVersion) {
case LangVersion.Default:
break;
Commit: eae53724c26447cc06ebb149dbdf91572d74af76
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 09:47:50 GMT
URL: https://github.com/mono/monodevelop/commit/eae53724c26447cc06ebb149dbdf91572d74af76
Makefile magic!
Changed paths:
M main/src/addins/WindowsPlatform/Makefile.am
M main/tests/Makefile.am
Modified: main/src/addins/WindowsPlatform/Makefile.am
===================================================================
@@ -1 +1,5 @@
include $(top_srcdir)/xbuild.include
+
+if ! ENABLE_WINDOWSPLATFORM
+SKIP=y
+endif
Modified: main/tests/Makefile.am
===================================================================
@@ -19,6 +19,9 @@ TEST_ASSEMBLIES_MAC = \
$(TEST_DIR)/MonoDevelop.VersionControl.Subversion.Tests.dll \
$(TEST_DIR)/MacPlatform.Tests.dll
+TEST_ASSEMBLIES_WINDOWS = \
+ $(TEST_DIR)/VersionControl.Subversion.Win32.Tests.dll
+
TEST_ASSEMBLIES_COMMON = \
$(TEST_DIR)/MonoDevelop.VersionControl.Git.Tests.dll \
$(TEST_DIR)/UnitTests.dll \
@@ -36,6 +39,10 @@ ALL_CSPROJ += $(TEST_PROJECTS_MAC)
TEST_ASSEMBLIES += $(TEST_ASSEMBLIES_MAC)
endif
+if ENABLE_WINDOWSPLATFORM
+TEST_ASSEMBLIES += $(TEST_ASSEMBLIES_WINDOWS)
+endif
+
test:
@if test -n "$(assembly)"; then \
for asm in $(TEST_ASSEMBLIES); do \
Commit: 6abc8da9d2153952b6b162dcf8256f2865fee239
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 09:59:29 GMT
URL: https://github.com/mono/monodevelop/commit/6abc8da9d2153952b6b162dcf8256f2865fee239
[Test Results] Fix lots of assertion fails where fraction is not in [0, 1].
Maybe there is a better fix?
Changed paths:
M main/src/addins/NUnit/Gui/TestResultsPad.cs
Modified: main/src/addins/NUnit/Gui/TestResultsPad.cs
===================================================================
@@ -667,6 +667,12 @@ void ITestProgressMonitor.EndTest (UnitTest test, UnitTestResult result)
frac = ((double)testsRun / (double)testsToRun);
else
frac = 1;
+
+ if (frac < 0)
+ frac = 0;
+ else if (frac > 1)
+ frac = 1;
+
progressBar.Fraction = frac;
progressBar.Text = testsRun + " / " + testsToRun;
}
Commit: 5464cdf133d372031d27e8ab8c83f7659927b9da
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 13:22:54 GMT
URL: https://github.com/mono/monodevelop/commit/5464cdf133d372031d27e8ab8c83f7659927b9da
Bump guiunit
Changed paths:
M main/external/guiunit
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 835c9675aa5eaaca284175608a03eb81ad499086
+Subproject commit ef0578ae17d5efa48aea3a6a28a7a1578201161b
Commit: c9f728a4c475bdbeb76efa854fa437abb9223f47
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 13:28:53 GMT
URL: https://github.com/mono/monodevelop/commit/c9f728a4c475bdbeb76efa854fa437abb9223f47
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]=891c9fc2bf33866f80bf5afd43f16710f211ddd7
+DEP_NEEDED_VERSION[0]=9942fff39e0adb4ea244c1c8e5ded1e2a70c7897
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 0fc0adf0ebf19fb83cf6c44a5f286c94490ddd20
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 13:29:47 GMT
URL: https://github.com/mono/monodevelop/commit/0fc0adf0ebf19fb83cf6c44a5f286c94490ddd20
bump md-addins and guiunit
Changed paths:
M main/external/guiunit
M version-checks
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit aaf2b9650baad6c5c9f06f5f431958803f386135
+Subproject commit ef0578ae17d5efa48aea3a6a28a7a1578201161b
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]=56bd5ed124caa9e066c27f4e8c7da665fc4a51eb
+DEP_NEEDED_VERSION[0]=1c13e37fe3eeb98a702e9ddc68f9cebe33ffd751
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: abd09cce5668f915ef874d8ad4488f6bdf2417af
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 15:14:48 GMT
URL: https://github.com/mono/monodevelop/commit/abd09cce5668f915ef874d8ad4488f6bdf2417af
[wintest.sh] Append /build/tests/ to the assembly name if it isn't there.
Changed paths:
M main/wintest.sh
Modified: main/wintest.sh
===================================================================
@@ -3,6 +3,9 @@ if [ $# -lt 1 ]; then
build/bin/mdtool run-md-tests build/tests/*.Tests.dll
else
for arg in $@; do
+ if [[ $arg != build/tests/* ]]; then
+ arg="build/tests/$arg"
+ fi
build/bin/mdtool run-md-tests $arg
done
fi
Commit: 1dae2e7467f01ea8272758313eae3dd088e86f21
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 15:30:56 GMT
URL: https://github.com/mono/monodevelop/commit/1dae2e7467f01ea8272758313eae3dd088e86f21
[WinTest.sh] Fix this file more.
Changed paths:
M main/wintest.sh
Modified: main/wintest.sh
===================================================================
@@ -1,11 +1,15 @@
if [ $# -lt 1 ]; then
build/bin/mdtool run-md-tests build/tests/UnitTests.dll
build/bin/mdtool run-md-tests build/tests/*.Tests.dll
+ build/bin/mdtool run-md-tests external/nrefactory/bin/Debug/ICSharpCode.NRefactory.Tests.dll
else
for arg in $@; do
- if [[ $arg != build/tests/* ]]; then
+ if [[ $arg == "ICSharpCode.NRefactory.Tests.dll" ]]; then
+ arg="external/nrefactory/bin/Debug/ICSharpCode.NRefactory.Tests.dll"
+ elif [[ $arg != build/tests/* ]]; then
arg="build/tests/$arg"
fi
- build/bin/mdtool run-md-tests $arg
+
+ (build/bin/mdtool run-md-tests $arg) || exit $?
done
fi
Commit: c4a1ce1241903dc8d451945a3b677a86271d354c
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 15:35:28 GMT
URL: https://github.com/mono/monodevelop/commit/c4a1ce1241903dc8d451945a3b677a86271d354c
[Wintest.sh] Let's glob better now, shall we?
Changed paths:
M main/wintest.sh
Modified: main/wintest.sh
===================================================================
@@ -4,7 +4,7 @@ if [ $# -lt 1 ]; then
build/bin/mdtool run-md-tests external/nrefactory/bin/Debug/ICSharpCode.NRefactory.Tests.dll
else
for arg in $@; do
- if [[ $arg == "ICSharpCode.NRefactory.Tests.dll" ]]; then
+ if [[ $arg == *ICSharpCode.NRefactory.Tests.dll ]]; then
arg="external/nrefactory/bin/Debug/ICSharpCode.NRefactory.Tests.dll"
elif [[ $arg != build/tests/* ]]; then
arg="build/tests/$arg"
Commit: eabd362a9e02f02c01f70667c4e9b4d472d22513
Author: Jérémie Laval <[email protected]> (garuma)
Date: 2013-10-24 17:18:03 GMT
URL: https://github.com/mono/monodevelop/commit/eabd362a9e02f02c01f70667c4e9b4d472d22513
[build] Bump md-addins/xwt to get Xwt.Mac link fixes
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 5a249be65965b6151513ae8820c8d4574f6a2514
+Subproject commit 4b0970039983644acdecc85ff30699bc627a4bab
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]=1c13e37fe3eeb98a702e9ddc68f9cebe33ffd751
+DEP_NEEDED_VERSION[0]=39db77384cf55aecbde9830a3425bd4d08f7ddbe
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 4b54ee252ebcef1b859ca513b88f84534ca37750
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 17:37:37 GMT
URL: https://github.com/mono/monodevelop/commit/4b54ee252ebcef1b859ca513b88f84534ca37750
[Debugger] Source analysis cleanup on debugger tests.
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/Main.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/SdbEvaluationTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/SdbStackFrameTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/StackFrameTests.cs
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/Main.cs
===================================================================
@@ -43,13 +43,13 @@ public static void Main (string[] args)
static string staticString = "some static";
string someString = "hi";
- string[] numbers = new string[] { "one","two","three" };
+ string[] numbers = { "one","two","three" };
public void TestEvaluation ()
{
int n = 32;
decimal dec = 123.456m;
- ArrayList alist = new ArrayList ();
+ var alist = new ArrayList ();
alist.Add (1);
alist.Add ("two");
alist.Add (3);
@@ -58,12 +58,12 @@ public void TestEvaluation ()
A b = new B ();
A a = new A ();
- WithDisplayString withDisplayString = new WithDisplayString ();
- WithProxy withProxy = new WithProxy ();
- WithToString withToString = new WithToString ();
+ var withDisplayString = new WithDisplayString ();
+ var withProxy = new WithProxy ();
+ var withToString = new WithToString ();
- int[][] numbersArrays = new int [2][];
- int[,,] numbersMulti = new int [3,4,5];
+ var numbersArrays = new int [2][];
+ var numbersMulti = new int [3,4,5];
var dict = new Dictionary<int, string[]> ();
var dictArray = new Dictionary<int, string[]> [2,3];
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
===================================================================
@@ -25,7 +25,6 @@
// THE SOFTWARE.
using System;
-using NUnit.Framework;
using UnitTests;
using Mono.Debugging.Client;
using MonoDevelop.Core;
@@ -38,10 +37,10 @@ namespace MonoDevelop.Debugger.Tests
{
public abstract class DebugTests: TestBase
{
- string eid;
+ readonly string eid;
DebuggerEngine engine;
- public DebugTests (string engineId)
+ protected DebugTests (string engineId)
{
eid = engineId;
}
@@ -60,23 +59,23 @@ public override void Setup ()
protected DebuggerSession Start (string test)
{
- DotNetExecutionCommand cmd = new DotNetExecutionCommand ();
+ var cmd = new DotNetExecutionCommand ();
cmd.Command = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "MonoDevelop.Debugger.Tests.TestApp.exe");
cmd.Arguments = test;
DebuggerStartInfo si = engine.CreateDebuggerStartInfo (cmd);
DebuggerSession session = engine.CreateSession ();
- DebuggerSessionOptions ops = new DebuggerSessionOptions ();
+ var ops = new DebuggerSessionOptions ();
ops.EvaluationOptions = EvaluationOptions.DefaultOptions;
ops.EvaluationOptions.EvaluationTimeout = 100000;
FilePath path = Util.TestsRootDir;
path = path.ParentDirectory.Combine ("src","addins","MonoDevelop.Debugger","MonoDevelop.Debugger.Tests.TestApp","Main.cs").FullPath;
TextFile file = TextFile.ReadFile (path);
- int i = file.Text.IndexOf ("void " + test);
+ int i = file.Text.IndexOf ("void " + test, StringComparison.Ordinal);
if (i == -1)
throw new Exception ("Test not found: " + test);
- i = file.Text.IndexOf ("/*break*/", i);
+ i = file.Text.IndexOf ("/*break*/", i, StringComparison.Ordinal);
if (i == -1)
throw new Exception ("Break marker not found: " + test);
int line, col;
@@ -84,11 +83,9 @@ protected DebuggerSession Start (string test)
Breakpoint bp = session.Breakpoints.Add (path, line);
bp.Enabled = true;
- ManualResetEvent done = new ManualResetEvent (false);
+ var done = new ManualResetEvent (false);
- session.OutputWriter = delegate (bool isStderr, string text) {
- Console.WriteLine ("PROC:" + text);
- };
+ session.OutputWriter = (isStderr, text) => Console.WriteLine ("PROC:" + text);
session.TargetHitBreakpoint += delegate {
done.Set ();
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.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 Mono.Debugging.Client;
using NUnit.Framework;
@@ -35,7 +34,7 @@ public abstract class EvaluationTests: DebugTests
DebuggerSession ds;
StackFrame frame;
- public EvaluationTests (string de): base (de)
+ protected EvaluationTests (string de): base (de)
{
}
@@ -59,7 +58,7 @@ ObjectValue Eval (string exp)
return frame.GetExpressionValue (exp, true).Sync ();
}
- [Test()]
+ [Test]
public void This ()
{
ObjectValue val = Eval ("this");
@@ -67,7 +66,7 @@ public void This ()
Assert.AreEqual ("MonoDevelop.Debugger.Tests.TestApp.MainClass", val.TypeName);
}
- [Test()]
+ [Test]
public void UnaryOperators ()
{
ObjectValue val = Eval ("~1234");
@@ -91,7 +90,7 @@ public void UnaryOperators ()
Assert.AreEqual ("int", val.TypeName);
}
- [Test()]
+ [Test]
public void TypeReference ()
{
ObjectValue val = Eval ("System.String");
@@ -110,7 +109,7 @@ public void TypeReference ()
Assert.AreEqual (ObjectValueFlags.Type, val.Flags & ObjectValueFlags.OriginMask);
}
- [Test()]
+ [Test]
public virtual void TypeReferenceGeneric ()
{
ObjectValue val = Eval ("System.Collections.Generic.Dictionary<string,int>");
@@ -119,7 +118,7 @@ public virtual void TypeReferenceGeneric ()
Assert.AreEqual (ObjectValueFlags.Type, val.Flags & ObjectValueFlags.OriginMask);
}
- [Test()]
+ [Test]
public virtual void Typeof ()
{
ObjectValue val = Eval ("typeof(System.Console)");
@@ -127,7 +126,7 @@ public virtual void Typeof ()
Assert.AreEqual ("{System.Console}", val.Value);
}
- [Test()]
+ [Test]
public void MethodInvoke ()
{
ObjectValue val;
@@ -168,7 +167,7 @@ public void MethodInvoke ()
Assert.AreEqual ("string", val.TypeName);
}
- [Test()]
+ [Test]
public void Indexers ()
{
ObjectValue val = Eval ("numbers[0]");
@@ -200,7 +199,7 @@ public void Indexers ()
Assert.AreEqual ("int", val.TypeName);
}
- [Test()]
+ [Test]
public void MemberReference ()
{
ObjectValue val = Eval ("alist.Count");
@@ -226,7 +225,7 @@ public void MemberReference ()
Assert.AreEqual ("string", val.TypeName);
}
- [Test()]
+ [Test]
public void ConditionalExpression ()
{
ObjectValue val = Eval ("true ? \"yes\" : \"no\"");
@@ -238,7 +237,7 @@ public void ConditionalExpression ()
Assert.AreEqual ("string", val.TypeName);
}
- [Test()]
+ [Test]
public void Cast ()
{
ObjectValue val;
@@ -364,7 +363,7 @@ public void Cast ()
Assert.AreEqual ("SomeEnum", val.TypeName);
}
- [Test()]
+ [Test]
public void BinaryOperators ()
{
ObjectValue val;
@@ -457,7 +456,7 @@ public void BinaryOperators ()
Assert.AreEqual ("bool", val.TypeName);
}
- [Test()]
+ [Test]
public virtual void Assignment ()
{
ObjectValue val;
@@ -494,7 +493,7 @@ public virtual void Assignment ()
Assert.AreEqual ("1", val.Value);
}
- [Test()]
+ [Test]
public virtual void AssignmentStatic ()
{
ObjectValue val;
@@ -508,7 +507,7 @@ public virtual void AssignmentStatic ()
Assert.AreEqual ("\"some static\"", val.Value);
}
- [Test()]
+ [Test]
public void FormatBool ()
{
ObjectValue val;
@@ -518,7 +517,7 @@ public void FormatBool ()
Assert.AreEqual ("false", val.Value);
}
- [Test()]
+ [Test]
public void FormatNumber ()
{
ObjectValue val;
@@ -545,7 +544,7 @@ public void FormatNumber ()
Assert.AreEqual ("123.456", val.Value);
}
- [Test()]
+ [Test]
public void FormatString ()
{
ObjectValue val;
@@ -559,7 +558,7 @@ public void FormatString ()
Assert.AreEqual ("\" \\\" \\\\ \\a \\b \\f \\v \\n \\r \\t\"", val.Value);
}
- [Test()]
+ [Test]
public void FormatChar ()
{
ObjectValue val;
@@ -612,7 +611,7 @@ public void FormatChar ()
Assert.AreEqual ("9 '\\t'", val.DisplayValue);
}
- [Test()]
+ [Test]
public void FormatObject ()
{
ObjectValue val;
@@ -634,7 +633,7 @@ public void FormatObject ()
Assert.AreEqual ("WithToString", val.TypeName);*/
}
- [Test()]
+ [Test]
public void FormatArray ()
{
ObjectValue val;
@@ -652,7 +651,7 @@ public void FormatArray ()
Assert.AreEqual ("int[,,]", val.TypeName);
}
- [Test()]
+ [Test]
public void FormatGeneric ()
{
ObjectValue val;
@@ -678,7 +677,7 @@ public void FormatGeneric ()
Assert.AreEqual ("Thing<string>.Done<int>", val.TypeName);
}
- [Test()]
+ [Test]
public void FormatEnum ()
{
ObjectValue val;
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/SdbEvaluationTests.cs
===================================================================
@@ -24,12 +24,11 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
using NUnit.Framework;
namespace MonoDevelop.Debugger.Tests.Soft
{
- [TestFixture()]
+ [TestFixture]
public class SdbEvaluationTests: EvaluationTests
{
public SdbEvaluationTests (): base ("Mono.Debugger.Soft")
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/SdbStackFrameTests.cs
===================================================================
@@ -24,12 +24,11 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
using NUnit.Framework;
namespace MonoDevelop.Debugger.Tests.Soft
{
- [TestFixture()]
+ [TestFixture]
public class SdbStackFrameTests: StackFrameTests
{
public SdbStackFrameTests (): base ("Mono.Debugger.Soft")
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/StackFrameTests.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 Mono.Debugging.Client;
using NUnit.Framework;
@@ -35,7 +34,7 @@ public abstract class StackFrameTests: DebugTests
DebuggerSession ds;
StackFrame frame;
- public StackFrameTests (string de): base (de)
+ protected StackFrameTests (string de): base (de)
{
}
Commit: 161736017e6727c334c70675c1dc4f5ba37d0c55
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 17:37:58 GMT
URL: https://github.com/mono/monodevelop/commit/161736017e6727c334c70675c1dc4f5ba37d0c55
[Tests] Debugger tests now run on Windows!
Changed paths:
M main/Main.sln
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj
Modified: main/Main.sln
===================================================================
@@ -288,12 +288,13 @@ Global
{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.Build.0 = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.ActiveCfg = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.Build.0 = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.Build.0 = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.ActiveCfg = Release|x86
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -351,6 +352,7 @@ Global
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj
===================================================================
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}</ProjectGuid>
@@ -10,7 +10,7 @@
<RootNamespace>MonoDevelop.Debugger.Tests.TestApp</RootNamespace>
<AssemblyName>MonoDevelop.Debugger.Tests.TestApp</AssemblyName>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
@@ -18,14 +18,16 @@
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
<NoWarn>1591;1573</NoWarn>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>none</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\..\..\..\build\tests</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
<NoWarn>1591;1573</NoWarn>
</PropertyGroup>
<ItemGroup>
Commit: d6abdaf8b053737306fc948fca6ba1d8c9975834
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 19:15:23 GMT
URL: https://github.com/mono/monodevelop/commit/d6abdaf8b053737306fc948fca6ba1d8c9975834
[NUnit] Don't assume that automatic updates always work
Only guiunit can give automatic updates, regardless of whether mdtool
is used or not. As such, even if we think automatic updates might
work we should protect against the case where they do not by loading
up the xml file at the end if automatic updates have not been received.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=15477
Changed paths:
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
M main/src/addins/NUnit/Services/TcpTestListener.cs
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -465,6 +465,7 @@ UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test,
LocalConsole cons = new LocalConsole ();
try {
+ MonoDevelop.NUnit.External.TcpTestListener tcpListener = null;
LocalTestMonitor localMonitor = new LocalTestMonitor (testContext, test, suiteName, testName != null);
if (!string.IsNullOrEmpty (cmd.Arguments))
@@ -477,20 +478,28 @@ UnitTestResult RunWithConsoleRunner (ProcessExecutionCommand cmd, UnitTest test,
else if (!string.IsNullOrEmpty (suiteName))
cmd.Arguments += " -run=" + suiteName;
if (automaticUpdates) {
- var tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
+ tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
cmd.Arguments += " -port=" + tcpListener.Port;
}
- var p = testContext.ExecutionContext.Execute (cmd, cons);
- testContext.Monitor.CancelRequested += p.Cancel;
- if (testContext.Monitor.IsCancelRequested)
- p.Cancel ();
- p.WaitForCompleted ();
-
- if (new FileInfo (outFile).Length == 0)
- throw new Exception ("Command failed");
+ // Note that we always dispose the tcp listener as we don't want it listening
+ // forever if the test runner does not try to connect to it
+ using (tcpListener) {
+ var p = testContext.ExecutionContext.Execute (cmd, cons);
- if (automaticUpdates) {
+ testContext.Monitor.CancelRequested += p.Cancel;
+ if (testContext.Monitor.IsCancelRequested)
+ p.Cancel ();
+ p.WaitForCompleted ();
+
+ if (new FileInfo (outFile).Length == 0)
+ throw new Exception ("Command failed");
+ }
+
+ // mdtool.exe does not necessarily guarantee we get automatic updates. It just guarantees
+ // that if guiunit is being used then it will give us updates. If you have a regular test
+ // assembly compiled against nunit.framework.dll
+ if (automaticUpdates && tcpListener.HasReceivedConnection) {
if (testName != null)
return localMonitor.SingleTestResult;
return test.GetLastResult ();
Modified: main/src/addins/NUnit/Services/TcpTestListener.cs
===================================================================
@@ -38,11 +38,15 @@
namespace MonoDevelop.NUnit.External
{
- class TcpTestListener
+ class TcpTestListener : IDisposable
{
string testSuiteName;
string rootTestName;
+ public bool HasReceivedConnection {
+ get; private set;
+ }
+
List<Tuple<string,UnitTestResult>> suiteStack = new List<Tuple<string, UnitTestResult>> ();
IRemoteEventListener listener;
@@ -120,6 +124,11 @@ public TcpTestListener (IRemoteEventListener listener, string suiteName)
});
}
+ public void Dispose ()
+ {
+ TcpListener.Stop ();
+ }
+
void UpdateTestSuiteStatus (string name, bool isTest)
{
if (testSuiteName.Length > 0)
Commit: 750c8d610165b106dee8ba109fe505867b3388f0
Author: alan <[email protected]>
Committer: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 19:15:30 GMT
URL: https://github.com/mono/monodevelop/commit/750c8d610165b106dee8ba109fe505867b3388f0
[NUnit] Use the pathname
The pathname is the correct thing to use, not the suitename
and testname.
The pathname handles tests subclassing other tests in the correct manner
Changed paths:
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -472,11 +472,9 @@ 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"));
- if (!string.IsNullOrEmpty (testName))
- cmd.Arguments += " -run=" + suiteName + "." + testName;
- else if (!string.IsNullOrEmpty (suiteName))
- cmd.Arguments += " -run=" + suiteName;
+ 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;
if (automaticUpdates) {
tcpListener = new MonoDevelop.NUnit.External.TcpTestListener (localMonitor, suiteName);
cmd.Arguments += " -port=" + tcpListener.Port;
Commit: 5dc5a343f5171b3aaab39195f5a9bf1d64ccdcf9
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-24 19:15:48 GMT
URL: https://github.com/mono/monodevelop/commit/5dc5a343f5171b3aaab39195f5a9bf1d64ccdcf9
[NUnit] GuiUnit as a project reference now works
I figured out a way to get the output filename for GuiUnit.exe
so i can now give that as the custom command when no other custom
command is supplied.
This means that both a direct binary reference on guiunit.exe and
also a project reference on it's csproj both result in your test
assembly being run using guiunit.exe
Changed paths:
M main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
Modified: main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
===================================================================
@@ -64,7 +64,7 @@ public NUnitProjectTestSuite (DotNetProject project): base (project.Name, projec
public static NUnitProjectTestSuite CreateTest (DotNetProject project)
{
foreach (var p in project.References)
- if (p.Reference.IndexOf ("GuiUnit") != -1 || p.Reference.IndexOf ("nunit.framework") != -1 || p.Reference.IndexOf ("nunit.core") != -1)
+ if (p.Reference.IndexOf ("GuiUnit", StringComparison.OrdinalIgnoreCase) != -1 || p.Reference.IndexOf ("nunit.framework") != -1 || p.Reference.IndexOf ("nunit.core") != -1)
return new NUnitProjectTestSuite (project);
return null;
}
@@ -134,10 +134,17 @@ public override void GetCustomConsoleRunner (out string command, out string args
command = r != null ? project.BaseDirectory.Combine (r.ToString ()).ToString () : null;
args = (string)project.ExtendedProperties ["TestRunnerArgs"];
if (command == null && args == null) {
- var guiUnit = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Assembly && Path.GetFileName (pref.Reference) == "GuiUnit.exe");
+ var guiUnit = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Assembly && StringComparer.OrdinalIgnoreCase.Equals (Path.GetFileName (pref.Reference), "GuiUnit.exe"));
if (guiUnit != null) {
command = guiUnit.Reference;
}
+
+ var projectReference = project.References.FirstOrDefault (pref => pref.ReferenceType == ReferenceType.Project && pref.Reference.StartsWith ("GuiUnit", StringComparison.OrdinalIgnoreCase));
+ if (IdeApp.IsInitialized && command == null && projectReference != null) {
+ var guiUnitProject = IdeApp.Workspace.GetAllProjects ().First (f => f.Name == projectReference.Reference);
+ if (guiUnitProject != null)
+ command = guiUnitProject.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
+ }
}
}
Commit: 27c386061e9a5ffc3f225f69750acb1cb4b120fa
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-24 19:28:53 GMT
URL: https://github.com/mono/monodevelop/commit/27c386061e9a5ffc3f225f69750acb1cb4b120fa
[Debugger] Enable CorDebugger tests.
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
Added paths:
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorEvaluationTests.cs
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorStackFrameTests.cs
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorEvaluationTests.cs
===================================================================
@@ -0,0 +1,39 @@
+//
+// CorEvaluationTests.cs
+//
+// Author:
+// Therzok <[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 NUnit.Framework;
+
+namespace MonoDevelop.Debugger.Tests.Win32
+{
+ [TestFixture]
+ public class CorEvaluationTests: EvaluationTests
+ {
+ public CorEvaluationTests (): base ("MonoDevelop.Debugger.Win32")
+ {
+ }
+ }
+}
+
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorStackFrameTests.cs
===================================================================
@@ -0,0 +1,38 @@
+//
+// CorStackFrametests.cs
+//
+// Author:
+// Therzok <[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 NUnit.Framework;
+
+namespace MonoDevelop.Debugger.Tests.Win32
+{
+ [TestFixture]
+ public class CorStackFrameTests : StackFrameTests
+ {
+ public CorStackFrameTests (): base ("MonoDevelop.Debugger.Win32")
+ {
+ }
+ }
+}
+
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
===================================================================
@@ -43,6 +43,8 @@
<Compile Include="StackFrameTests.cs" />
<Compile Include="MdbStackFrameTests.cs" />
<Compile Include="SdbStackFrameTests.cs" />
+ <Compile Include="CorEvaluationTests.cs" />
+ <Compile Include="CorStackFrameTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MonoDevelop.Debugger.csproj">
Commit: e7a70cf7dd6422bbc57b18cbfbd66418d9f69aaa
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-10-25 08:33:13 GMT
URL: https://github.com/mono/monodevelop/commit/e7a70cf7dd6422bbc57b18cbfbd66418d9f69aaa
Merge pull request #422 from mono/debuggerTests
Enable CorDebugger tests
Changed paths:
M main/Main.sln
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
Added paths:
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorEvaluationTests.cs
A main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorStackFrameTests.cs
Modified: main/Main.sln
===================================================================
@@ -288,12 +288,13 @@ Global
{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Debug|Any CPU.Build.0 = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.ActiveCfg = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugMac|Any CPU.Build.0 = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.ActiveCfg = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.DebugWin32|Any CPU.Build.0 = Debug|x86
+ {05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}.Release|Any CPU.ActiveCfg = Release|x86
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07CC7654-27D6-421D-A64C-0FFA40456FA2}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -351,6 +352,7 @@ Global
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests.TestApp/MonoDevelop.Debugger.Tests.TestApp.csproj
===================================================================
@@ -2,7 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{05EDFE55-C8D1-47E4-BB61-0BC809CD82E2}</ProjectGuid>
@@ -10,7 +10,7 @@
<RootNamespace>MonoDevelop.Debugger.Tests.TestApp</RootNamespace>
<AssemblyName>MonoDevelop.Debugger.Tests.TestApp</AssemblyName>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>False</Optimize>
@@ -18,14 +18,16 @@
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
<NoWarn>1591;1573</NoWarn>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>none</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\..\..\..\build\tests</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
<NoWarn>1591;1573</NoWarn>
</PropertyGroup>
<ItemGroup>
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorEvaluationTests.cs
===================================================================
@@ -0,0 +1,39 @@
+//
+// CorEvaluationTests.cs
+//
+// Author:
+// Therzok <[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 NUnit.Framework;
+
+namespace MonoDevelop.Debugger.Tests.Win32
+{
+ [TestFixture]
+ public class CorEvaluationTests: EvaluationTests
+ {
+ public CorEvaluationTests (): base ("MonoDevelop.Debugger.Win32")
+ {
+ }
+ }
+}
+
Added: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorStackFrameTests.cs
===================================================================
@@ -0,0 +1,38 @@
+//
+// CorStackFrametests.cs
+//
+// Author:
+// Therzok <[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 NUnit.Framework;
+
+namespace MonoDevelop.Debugger.Tests.Win32
+{
+ [TestFixture]
+ public class CorStackFrameTests : StackFrameTests
+ {
+ public CorStackFrameTests (): base ("MonoDevelop.Debugger.Win32")
+ {
+ }
+ }
+}
+
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/MonoDevelop.Debugger.Tests.csproj
===================================================================
@@ -43,6 +43,8 @@
<Compile Include="StackFrameTests.cs" />
<Compile Include="MdbStackFrameTests.cs" />
<Compile Include="SdbStackFrameTests.cs" />
+ <Compile Include="CorEvaluationTests.cs" />
+ <Compile Include="CorStackFrameTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MonoDevelop.Debugger.csproj">
Commit: 6c89bb46d4cbfc3aa0d240ea0fb88bec04f3e28d
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-10-25 09:03:44 GMT
URL: https://github.com/mono/monodevelop/commit/6c89bb46d4cbfc3aa0d240ea0fb88bec04f3e28d
Merge pull request #421 from mono/testResultsPad
[Test Results] Fix lots of assertion fails where fraction is not in [0,1]
Changed paths:
M main/src/addins/NUnit/Gui/TestResultsPad.cs
Modified: main/src/addins/NUnit/Gui/TestResultsPad.cs
===================================================================
@@ -667,6 +667,12 @@ void ITestProgressMonitor.EndTest (UnitTest test, UnitTestResult result)
frac = ((double)testsRun / (double)testsToRun);
else
frac = 1;
+
+ if (frac < 0)
+ frac = 0;
+ else if (frac > 1)
+ frac = 1;
+
progressBar.Fraction = frac;
progressBar.Text = testsRun + " / " + testsToRun;
}
Commit: dc227b8c6495c8e3d643fa2d0d4c863eeba415c7
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-25 13:54:35 GMT
URL: https://github.com/mono/monodevelop/commit/dc227b8c6495c8e3d643fa2d0d4c863eeba415c7
[Debugger] Fix tests to use correspondent runtime.
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorEvaluationTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorStackFrameTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/StackFrameTests.cs
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorEvaluationTests.cs
===================================================================
@@ -29,6 +29,7 @@
namespace MonoDevelop.Debugger.Tests.Win32
{
[TestFixture]
+ [Platform (Include = "Win")]
public class CorEvaluationTests: EvaluationTests
{
public CorEvaluationTests (): base ("MonoDevelop.Debugger.Win32")
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/CorStackFrameTests.cs
===================================================================
@@ -28,6 +28,7 @@
namespace MonoDevelop.Debugger.Tests.Win32
{
[TestFixture]
+ [Platform (Include = "Win")]
public class CorStackFrameTests : StackFrameTests
{
public CorStackFrameTests (): base ("MonoDevelop.Debugger.Win32")
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/DebugTests.cs
===================================================================
@@ -32,24 +32,25 @@
using System.IO;
using System.Threading;
using MonoDevelop.Projects.Text;
+using MonoDevelop.Core.Assemblies;
namespace MonoDevelop.Debugger.Tests
{
public abstract class DebugTests: TestBase
{
- readonly string eid;
+ readonly protected string EngineId;
DebuggerEngine engine;
protected DebugTests (string engineId)
{
- eid = engineId;
+ EngineId = engineId;
}
public override void Setup ()
{
base.Setup ();
foreach (DebuggerEngine e in DebuggingService.GetDebuggerEngines ()) {
- if (e.Id == eid) {
+ if (e.Id == EngineId) {
engine = e;
break;
}
@@ -59,10 +60,27 @@ public override void Setup ()
protected DebuggerSession Start (string test)
{
+ TargetRuntime runtime;
+ switch (EngineId) {
+ case "MonoDevelop.Debugger.Win32":
+ runtime = Runtime.SystemAssemblyService.GetTargetRuntime ("MS.NET");
+ break;
+ case "Mono.Debugger.Soft":
+ runtime = Runtime.SystemAssemblyService.GetTargetRuntime ("Mono");
+ break;
+ default:
+ runtime = Runtime.SystemAssemblyService.DefaultRuntime;
+ break;
+ }
+
+ if (runtime == null)
+ return null;
+
var cmd = new DotNetExecutionCommand ();
cmd.Command = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "MonoDevelop.Debugger.Tests.TestApp.exe");
cmd.Arguments = test;
-
+ cmd.TargetRuntime = runtime;
+
DebuggerStartInfo si = engine.CreateDebuggerStartInfo (cmd);
DebuggerSession session = engine.CreateSession ();
var ops = new DebuggerSessionOptions ();
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
===================================================================
@@ -42,6 +42,9 @@ public override void Setup ()
{
base.Setup ();
ds = Start ("TestEvaluation");
+ if (ds == null)
+ Assert.Ignore ("Engine not found: {0}", EngineId);
+
frame = ds.ActiveThread.Backtrace.GetFrame (0);
}
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/StackFrameTests.cs
===================================================================
@@ -42,6 +42,9 @@ public override void Setup ()
{
base.Setup ();
ds = Start ("TestEvaluation");
+ if (ds == null)
+ Assert.Ignore ("Engine not found: {0}", EngineId);
+
frame = ds.ActiveThread.Backtrace.GetFrame (0);
}
Commit: fe0d6f373afb019f42ffc93cbd2c4e9cd2f4488a
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-10-25 13:55:12 GMT
URL: https://github.com/mono/monodevelop/commit/fe0d6f373afb019f42ffc93cbd2c4e9cd2f4488a
Merge pull request #420 from mono/fixAPI
[Version Control] Hide what's not API and seal most stuff.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
===================================================================
@@ -65,7 +65,7 @@ protected override void Update (CommandInfo info)
}
}
- class PushCommandHandler: GitCommandHandler
+ sealed class PushCommandHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -73,7 +73,7 @@ protected override void Run ()
}
}
- class SwitchToBranchHandler: GitCommandHandler
+ sealed class SwitchToBranchHandler: GitCommandHandler
{
protected override void Run (object dataItem)
{
@@ -102,7 +102,7 @@ protected override void Update (CommandArrayInfo info)
}
}
- class ManageBranchesHandler: GitCommandHandler
+ sealed class ManageBranchesHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -110,7 +110,7 @@ protected override void Run ()
}
}
- class MergeBranchHandler: GitCommandHandler
+ sealed class MergeBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -118,7 +118,7 @@ protected override void Run ()
}
}
- class RebaseBranchHandler: GitCommandHandler
+ sealed class RebaseBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -126,7 +126,7 @@ protected override void Run ()
}
}
- class StashHandler: GitCommandHandler
+ sealed class StashHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -153,7 +153,7 @@ protected override void Run ()
}
}
- class StashPopHandler: GitCommandHandler
+ sealed class StashPopHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class ManageStashesHandler: GitCommandHandler
+ sealed class ManageStashesHandler: GitCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class FilteredStatus : NGit.Api.StatusCommand
+ sealed class FilteredStatus : NGit.Api.StatusCommand
{
WorkingTreeIterator iter;
IndexDiff diff;
@@ -76,7 +76,7 @@ public override NGit.Api.Status Call ()
return new NGit.Api.Status (diff);
}
- public virtual ICollection<string> GetIgnoredNotInIndex ()
+ public ICollection<string> GetIgnoredNotInIndex ()
{
return diff.GetIgnoredNotInIndex ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCommitDialogExtension: CommitDialogExtension
+ public sealed class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCredentials: CredentialsProvider
+ public sealed class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitNodeBuilderExtension: NodeBuilderExtension
+ public sealed class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitOptionsPanel : OptionsPanel
+ public sealed class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
===================================================================
@@ -1713,7 +1713,7 @@ protected override void OnUnignore (FilePath[] localPath)
}
}
- public class GitRevision: Revision
+ public sealed class GitRevision: Revision
{
readonly string rev;
@@ -1753,13 +1753,13 @@ public override Revision GetPrevious ()
}
}
- public class Branch
+ public sealed class Branch
{
public string Name { get; internal set; }
public string Tracking { get; internal set; }
}
- public class RemoteSource
+ public sealed class RemoteSource
{
internal RemoteConfig RepoRemote;
internal StoredConfig cfg;
@@ -1800,7 +1800,7 @@ internal void Update ()
public string PushUrl { get; internal set; }
}
- class GitMonitor: ProgressMonitor, IDisposable
+ sealed class GitMonitor: ProgressMonitor, IDisposable
{
readonly IProgressMonitor monitor;
int currentWork;
@@ -1872,7 +1872,7 @@ public void Dispose ()
}
}
- class LocalGitRepository: FileRepository
+ sealed class LocalGitRepository: FileRepository
{
WeakReference dirCacheRef;
DateTime dirCacheTimestamp;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- class GitSelectRevisionDialog : Xwt.Dialog
+ sealed class GitSelectRevisionDialog : Xwt.Dialog
{
readonly Xwt.TextEntry tagNameEntry;
readonly Xwt.TextEntry tagMessageEntry;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitSupportFeature: ISolutionItemFeature
+ public sealed class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
===================================================================
@@ -41,7 +41,7 @@
namespace MonoDevelop.VersionControl.Git
{
- internal static class GitUtil
+ static class GitUtil
{
public static string ToGitPath (this NGit.Repository repo, FilePath filePath)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class MyersDiff : GitCommand<IList<DiffEntry>>
+ public sealed class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetCached(bool cached)
+ public MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public virtual MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOutputStream(OutputStream @out)
+ public MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public virtual MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetContextLines(int contextLines)
+ public MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public virtual MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
+ public MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
+ public MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
===================================================================
@@ -38,7 +38,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class Stash
+ public sealed class Stash
{
internal string CommitId { get; private set; }
internal string FullLine { get; private set; }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -64,7 +64,7 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
+ public sealed class LibApr0: LibApr
{
private const string aprlib = "libapr-0.so.0";
@@ -97,7 +97,7 @@ public class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public class LibApr1: LibApr
+ public sealed class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient0 : LibSvnClient {
+ public sealed class LibSvnClient0 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient1 : LibSvnClient {
+ public sealed class LibSvnClient1 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Subversion
{
- public class SvnRevision : Revision
+ public sealed class SvnRevision : Revision
{
public readonly int Rev;
public readonly int Kind;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlGeneralOptionsPanel : OptionsPanel
+ public sealed class VersionControlGeneralOptionsPanel : OptionsPanel
{
Xwt.CheckBox disableVersionControl;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
+ public sealed class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
{
CommitMessageStylePanelWidget widget;
CommitMessageFormat format;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
===================================================================
@@ -34,7 +34,7 @@ public interface IBlameView : IAttachableViewContent
{
}
- internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+ sealed class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
{
BlameWidget widget;
VersionControlDocumentInfo info;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
===================================================================
@@ -44,7 +44,7 @@ public enum BlameCommands {
ShowLog
}
- public class BlameWidget : Bin
+ public sealed class BlameWidget : Bin
{
Adjustment vAdjustment;
Gtk.VScrollbar vScrollBar;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl.Views
{
[System.ComponentModel.ToolboxItem (true)]
- public class ChangeSetView: ScrolledWindow
+ public sealed class ChangeSetView: ScrolledWindow
{
bool disposed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Views
{
[ToolboxItem (true)]
- public class ComparisonWidget : EditorCompareWidgetBase
+ public sealed class ComparisonWidget : EditorCompareWidgetBase
{
internal DropDownBox originalComboBox, diffComboBox;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
/// <summary>
/// Parser for unified diffs
/// </summary>
- public class DiffParser : TypeSystemParser
+ public sealed class DiffParser : TypeSystemParser
{
// Match the original file and time/revstamp line, capturing the filepath and the stamp
static Regex fileHeaderExpression = new Regex (@"^---\s+(?<filepath>[^\t]+)\t(?<stamp>.*)$", RegexOptions.Compiled);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
===================================================================
@@ -35,7 +35,7 @@ public interface IDiffView : IAttachableViewContent
{
}
- public class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
+ sealed class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
{
DiffWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Views
//FIXME: re-merge this with MonoDevelop.Components.DropDownBox
[Category ("Widgets")]
[ToolboxItem (true)]
- public class DropDownBox : Gtk.Button
+ public sealed class DropDownBox : Gtk.Button
{
Pango.Layout layout;
const int pixbufSpacing = 2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
===================================================================
@@ -13,7 +13,7 @@ public interface ILogView : IAttachableViewContent
{
}
- public class LogView : BaseView, ILogView
+ sealed class LogView : BaseView, ILogView
{
LogWidget widget;
VersionInfo vinfo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
===================================================================
@@ -32,7 +32,7 @@ public interface IMergeView : IAttachableViewContent
{
}
- class MergeView : BaseView, IMergeView
+ sealed class MergeView : BaseView, IMergeView
{
VersionControlDocumentInfo info;
MergeWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
===================================================================
@@ -36,7 +36,7 @@
namespace MonoDevelop.VersionControl.Views
{
- public class MergeWidget : EditorCompareWidgetBase
+ public sealed class MergeWidget : EditorCompareWidgetBase
{
protected override TextEditor MainEditor {
get {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl.Views
{
- internal class StatusView : BaseView
+ sealed class StatusView : BaseView
{
string filepath;
Repository vc;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Views
{
- class SubviewAttachmentHandler : CommandHandler
+ sealed class SubviewAttachmentHandler : CommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- internal class AddCommand
+ sealed class AddCommand
{
public static bool Add (VersionControlItemList items, bool test)
{
@@ -17,7 +17,7 @@ public static bool Add (VersionControlItemList items, bool test)
return true;
}
- private class AddWorker : Task {
+ class AddWorker : Task {
VersionControlItemList items;
public AddWorker (VersionControlItemList items)
@@ -92,7 +92,7 @@ protected override void Run ()
//
// }
- internal class RemoveCommand
+ sealed class RemoveCommand
{
public static bool Remove (VersionControlItemList items, bool test)
{
@@ -108,7 +108,7 @@ public static bool Remove (VersionControlItemList items, bool test)
return true;
}
- private class RemoveWorker : Task {
+ class RemoveWorker : Task {
VersionControlItemList items;
public RemoveWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
@@ -4,11 +4,11 @@
namespace MonoDevelop.VersionControl
{
- public abstract class BaseView : AbstractBaseViewContent, IViewContent
+ abstract class BaseView : AbstractBaseViewContent, IViewContent
{
string name;
- public BaseView (string name)
+ protected BaseView (string name)
{
this.name = name;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class BlameCommand
+ static class BlameCommand
{
internal static readonly string BlameViewHandlers = "/MonoDevelop/VersionControl/BlameViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
===================================================================
@@ -36,10 +36,10 @@
namespace MonoDevelop.VersionControl
{
- class ChangeLogWriter
+ sealed class ChangeLogWriter
{
- private Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
- private string changelog_path;
+ Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
+ string changelog_path;
AuthorInformation uinfo;
public ChangeLogWriter (string path, AuthorInformation uinfo)
@@ -69,7 +69,7 @@ public void AddFile (string message, string path)
}
}
- private string GetRelativeEntryPath (string path)
+ string GetRelativeEntryPath (string path)
{
if (!path.StartsWith (changelog_path, System.StringComparison.Ordinal)) {
return null;
@@ -85,13 +85,13 @@ public override string ToString ()
CommitMessageStyle message_style = MessageFormat.Style;
- TextFormatter formatter = new TextFormatter ();
+ var formatter = new TextFormatter ();
formatter.MaxColumns = MessageFormat.MaxColumns;
formatter.TabWidth = MessageFormat.TabWidth;
formatter.TabsAsSpaces = MessageFormat.TabsAsSpaces;
if (message_style.Header.Length > 0) {
- string [,] tags = new string[,] { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
+ string [,] tags = { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
formatter.Append (StringParserService.Parse (message_style.Header, tags));
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl
{
- internal class CheckoutCommand : CommandHandler
+ sealed class CheckoutCommand : CommandHandler
{
protected override void Update (CommandInfo info)
{
@@ -25,79 +25,79 @@ protected override void Run()
del.Destroy ();
}
}
- }
-
- class CheckoutWorker : Task
- {
- Repository vc;
- string path;
-
- public CheckoutWorker (Repository vc, string path)
- {
- this.vc = vc;
- this.path = path;
- OperationType = VersionControlOperationType.Pull;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Checking out {0}...", path);
- }
-
- protected override IProgressMonitor CreateProgressMonitor ()
- {
- return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
- base.CreateProgressMonitor (),
- new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
- );
- }
-
- protected override void Run ()
+
+ class CheckoutWorker : Task
{
- vc.Checkout (path, null, true, Monitor);
- if (Monitor.IsCancelRequested) {
- Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
- return;
- }
+ Repository vc;
+ string path;
- if (!System.IO.Directory.Exists (path)) {
- Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
- return;
+ public CheckoutWorker (Repository vc, string path)
+ {
+ this.vc = vc;
+ this.path = path;
+ OperationType = VersionControlOperationType.Pull;
}
- string projectFn = null;
-
- string[] list = System.IO.Directory.GetFiles(path);
- foreach (string str in list ) {
- if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Checking out {0}...", path);
}
- if ( projectFn == null ) {
- foreach ( string str in list ) {
- if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
- }
+
+ protected override IProgressMonitor CreateProgressMonitor ()
+ {
+ return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
+ base.CreateProgressMonitor (),
+ new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+ );
}
- if ( projectFn == null ) {
+
+ protected override void Run ()
+ {
+ vc.Checkout (path, null, true, Monitor);
+ if (Monitor.IsCancelRequested) {
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
+ return;
+ }
+
+ if (!System.IO.Directory.Exists (path)) {
+ Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
+ return;
+ }
+
+ string projectFn = null;
+
+ string[] list = System.IO.Directory.GetFiles(path);
foreach (string str in list ) {
- if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
projectFn = str;
break;
}
- }
- }
-
- if (projectFn != null) {
- DispatchService.GuiDispatch (delegate {
- IdeApp.Workspace.OpenWorkspaceItem (projectFn);
- });
+ }
+ if ( projectFn == null ) {
+ foreach ( string str in list ) {
+ if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+ if ( projectFn == null ) {
+ foreach (string str in list ) {
+ if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+
+ if (projectFn != null) {
+ DispatchService.GuiDispatch (delegate {
+ IdeApp.Workspace.OpenWorkspaceItem (projectFn);
+ });
+ }
+
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
-
- Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
===================================================================
@@ -129,7 +129,7 @@ protected virtual bool RunCommand (VersionControlItemList items, bool test)
}
}
- class UpdateCommandHandler: SolutionVersionControlCommandHandler
+ sealed class UpdateCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -137,7 +137,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class StatusCommandHandler: SolutionVersionControlCommandHandler
+ sealed class StatusCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -145,7 +145,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- class AddCommandHandler: FileVersionControlCommandHandler
+ sealed class AddCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -159,7 +159,7 @@ protected override void Update (CommandInfo info)
}
}
- class RemoveCommandHandler: FileVersionControlCommandHandler
+ sealed class RemoveCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -173,7 +173,7 @@ protected override void Update (CommandInfo info)
}
}
- class RevertCommandHandler: FileVersionControlCommandHandler
+ sealed class RevertCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- class LockCommandHandler: FileVersionControlCommandHandler
+ sealed class LockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -201,7 +201,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnlockCommandHandler: FileVersionControlCommandHandler
+ sealed class UnlockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -215,7 +215,7 @@ protected override void Update (CommandInfo info)
}
}
- class IgnoreCommandHandler : FileVersionControlCommandHandler
+ sealed class IgnoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -229,7 +229,7 @@ protected override void Update (CommandInfo info)
}
}
- class UnignoreCommandHandler : FileVersionControlCommandHandler
+ sealed class UnignoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -243,7 +243,7 @@ protected override void Update (CommandInfo info)
}
}
- class CurrentFileDiffHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileDiffHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -252,7 +252,7 @@ protected override void Run ()
}
}
- class CurrentFileBlameHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileBlameHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -261,7 +261,7 @@ protected override void Run ()
}
}
- class CurrentFileLogHandler : FileVersionControlCommandHandler
+ sealed class CurrentFileLogHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- class CommitCommand
+ static class CommitCommand
{
public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
{
@@ -49,7 +49,7 @@ public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
}
}
- private class CommitWorker : Task
+ class CommitWorker : Task
{
Repository vc;
ChangeSet changeSet;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
===================================================================
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
/// <summary>
/// Class for creating patches from VersionControlItems
/// </summary>
- public class CreatePatchCommand
+ static class CreatePatchCommand
{
/// <summary>
/// Creates a patch from a VersionControlItemList
@@ -56,7 +56,8 @@ public class CreatePatchCommand
public static bool CreatePatch (VersionControlItemList items, bool test)
{
bool can = CanCreatePatch (items);
- if (test || !can){ return can; }
+ if (test || !can)
+ return can;
FilePath basePath = items.FindMostSpecificParent ();
if (FilePath.Null == basePath)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultBlameViewHandler : IBlameViewHandler
+ sealed class DefaultBlameViewHandler : IBlameViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultDiffViewHandler : IDiffViewHandler
+ sealed class DefaultDiffViewHandler : IDiffViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultLogViewHandler : ILogViewHandler
+ sealed class DefaultLogViewHandler : ILogViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class DefaultMergeViewHandler : IMergeViewHandler
+ sealed class DefaultMergeViewHandler : IMergeViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class DiffCommand
+ static class DiffCommand
{
internal static readonly string DiffViewHandlers = "/MonoDevelop/VersionControl/DiffViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- class IgnoreCommand
+ static class IgnoreCommand
{
public static bool Ignore (VersionControlItemList items, bool test)
{
@@ -62,7 +62,7 @@ static bool IgnoreInternal (VersionControlItemList items, bool test)
}
}
- private class IgnoreWorker : Task
+ class IgnoreWorker : Task
{
VersionControlItemList items;
@@ -93,7 +93,7 @@ protected override void Run ()
}
}
- class UnignoreCommand
+ static class UnignoreCommand
{
public static bool Unignore (VersionControlItemList items, bool test)
{
@@ -125,7 +125,7 @@ static bool UnignoreInternal (VersionControlItemList items, bool test)
}
}
- private class UnignoreWorker : Task
+ class UnignoreWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class LockCommand
+ static class LockCommand
{
public static bool Lock (VersionControlItemList items, bool test)
{
@@ -43,7 +43,7 @@ public static bool Lock (VersionControlItemList items, bool test)
return true;
}
- private class LockWorker : Task
+ class LockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class LogCommand
+ static class LogCommand
{
internal static readonly string LogViewHandlers = "/MonoDevelop/VersionControl/LogViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public class MergeCommand
+ static class MergeCommand
{
internal static readonly string MergeViewHandlers = "/MonoDevelop/VersionControl/MergeViewHandler";
@@ -42,7 +42,7 @@ static bool CanShow (VersionControlItem item)
&& item.VersionInfo.IsVersioned
&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
}
-
+
public static bool Show (VersionControlItemList items, bool test)
{
if (test)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
===================================================================
@@ -8,7 +8,7 @@
namespace MonoDevelop.VersionControl
{
- internal class PublishCommand
+ static class PublishCommand
{
public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
{
@@ -67,38 +67,38 @@ static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
return true;
return false;
}
- }
-
- internal class PublishWorker : Task {
- Repository vc;
- FilePath path;
- string moduleName;
- FilePath[] files;
- string message;
-
- public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
- {
- this.vc = vc;
- this.path = localPath;
- this.moduleName = moduleName;
- this.files = files;
- this.message = message;
- OperationType = VersionControlOperationType.Push;
- }
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
- }
-
- protected override void Run ()
- {
- vc.Publish (moduleName, path, files, message, Monitor);
- Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
-
- Gtk.Application.Invoke (delegate {
- VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
- });
+ class PublishWorker : Task {
+ Repository vc;
+ FilePath path;
+ string moduleName;
+ FilePath[] files;
+ string message;
+
+ public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
+ {
+ this.vc = vc;
+ this.path = localPath;
+ this.moduleName = moduleName;
+ this.files = files;
+ this.message = message;
+ OperationType = VersionControlOperationType.Push;
+ }
+
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
+ }
+
+ protected override void Run ()
+ {
+ vc.Publish (moduleName, path, files, message, Monitor);
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+
+ Gtk.Application.Invoke (delegate {
+ VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
+ });
+ }
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -29,12 +29,12 @@ public FilePath RootPath
public event EventHandler NameChanged;
- public Repository ()
+ protected Repository ()
{
infoCache = new VersionInfoCache (this);
}
- public Repository (VersionControlSystem vcs): this ()
+ protected Repository (VersionControlSystem vcs): this ()
{
VersionControlSystem = vcs;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- public class ResolveConflictsCommand
+ static class ResolveConflictsCommand
{
public static bool ResolveConflicts (VersionControlItemList list, bool test)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
===================================================================
@@ -7,9 +7,8 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertCommand
+ static class RevertCommand
{
-
public static bool Revert (VersionControlItemList items, bool test)
{
if (RevertInternal (items, test)) {
@@ -20,7 +19,7 @@ public static bool Revert (VersionControlItemList items, bool test)
return false;
}
- private static bool RevertInternal (VersionControlItemList items, bool test)
+ static bool RevertInternal (VersionControlItemList items, bool test)
{
try {
if (test)
@@ -43,22 +42,22 @@ private static bool RevertInternal (VersionControlItemList items, bool test)
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
VersionControlItemList items;
-
+
public RevertWorker (VersionControlItemList items) {
this.items = items;
}
-
+
protected override string GetDescription() {
return GettextCatalog.GetString ("Reverting ...");
}
-
+
protected override void Run ()
{
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
-
+
Monitor.ReportSuccess (GettextCatalog.GetString ("Revert operation completed."));
Gtk.Application.Invoke (delegate {
foreach (VersionControlItem item in items) {
@@ -74,6 +73,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- internal class RevertRevisionsCommands
+ static class RevertRevisionsCommands
{
public static bool RevertRevision (Repository vc, string path, Revision revision, bool test)
{
@@ -75,7 +75,7 @@ private static bool RevertRevisions (Repository vc, string path, Revision revisi
}
}
- private class RevertWorker : Task {
+ class RevertWorker : Task {
Repository vc;
string path;
Revision revision;
@@ -130,6 +130,5 @@ protected override void Run ()
});
}
}
-
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
===================================================================
@@ -6,7 +6,7 @@
namespace MonoDevelop.VersionControl
{
- internal abstract class Task
+ abstract class Task
{
IProgressMonitor tracker;
ThreadNotify threadnotify;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- public class UnknownRepository: Repository, IExtendedDataItem
+ public sealed class UnknownRepository: Repository, IExtendedDataItem
{
Hashtable properties;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
===================================================================
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
{
- public class UnlockCommand
+ static class UnlockCommand
{
public static bool Unlock (VersionControlItemList items, bool test)
{
@@ -45,7 +45,7 @@ public static bool Unlock (VersionControlItemList items, bool test)
return true;
}
- private class UnlockWorker : Task
+ class UnlockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- internal class UpdateCommand
+ static class UpdateCommand
{
public static bool Update (VersionControlItemList items, bool test)
{
@@ -16,7 +16,7 @@ public static bool Update (VersionControlItemList items, bool test)
return true;
}
- private class UpdateWorker : Task {
+ class UpdateWorker : Task {
VersionControlItemList items;
public UpdateWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
@@ -9,11 +9,11 @@ public abstract class UrlBasedRepository: Repository, ICustomDataItem
string url;
Uri uri;
- public UrlBasedRepository ()
+ protected UrlBasedRepository ()
{
}
- public UrlBasedRepository (VersionControlSystem vcs): base (vcs)
+ protected UrlBasedRepository (VersionControlSystem vcs): base (vcs)
{
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionControlConfiguration
+ sealed class VersionControlConfiguration
{
[ItemProperty ("Repositories")]
List<Repository> repositories = new List<Repository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl
{
- internal class VersionControlFileSystemExtension: FileSystemExtension
+ class VersionControlFileSystemExtension: FileSystemExtension
{
public override bool CanHandlePath (FilePath path, bool isDirectory)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItem
+ public sealed class VersionControlItem
{
FilePath path;
bool isDirectory;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlItemList: List<VersionControlItem>
+ public sealed class VersionControlItemList: List<VersionControlItem>
{
public VersionControlItemList[] SplitByRepository ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
@@ -251,7 +251,7 @@ internal static string GetPath (object dataObject)
- class AddinCommandHandler : VersionControlCommandHandler
+ sealed class AddinCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (Commands.Update)]
@@ -428,7 +428,7 @@ protected void UpdateResolveConflicts (CommandInfo item)
TestCommand (Commands.ResolveConflicts, item, false);
}
- private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
+ void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
{
TestResult res = RunCommand(cmd, true, projRecurse);
if (res == TestResult.NoVersionControl && cmd == Commands.Log) {
@@ -443,7 +443,7 @@ private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true
item.Visible = res == TestResult.Enable;
}
- private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+ TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
{
VersionControlItemList items = GetItems (projRecurse);
@@ -530,7 +530,7 @@ public override void RefreshItem ()
}
}
- class OpenCommandHandler : VersionControlCommandHandler
+ sealed class OpenCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (ViewCommands.Open)]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
===================================================================
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
{
[PolicyType ("Version control commit message style")]
[DataItem ("VersionControlPolicy")]
- public class VersionControlPolicy: IEquatable<VersionControlPolicy>
+ public sealed class VersionControlPolicy: IEquatable<VersionControlPolicy>
{
public VersionControlPolicy()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionControlService
+ public static class VersionControlService
{
static Gdk.Pixbuf overlay_modified;
static Gdk.Pixbuf overlay_removed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- public class VersionInfo
+ public sealed class VersionInfo
{
FilePath localPath;
string repositoryPath;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionInfoCache
+ sealed class VersionInfoCache
{
Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
@@ -137,7 +137,7 @@ public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionIn
}
}
- class DirectoryStatus
+ sealed class DirectoryStatus
{
public VersionInfo[] FileInfo { get; set; }
public bool HasRemoteStatus { get; set; }
Commit: 0aba03794f85fe7890c9603543cb40573b2c3caa
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-25 14:26:03 GMT
URL: https://github.com/mono/monodevelop/commit/0aba03794f85fe7890c9603543cb40573b2c3caa
[Debugger] Fix NRE in Debugger tests.
Changed paths:
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/StackFrameTests.cs
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
===================================================================
@@ -51,8 +51,10 @@ public override void Setup ()
public override void TearDown ()
{
base.TearDown ();
- ds.Exit ();
- ds.Dispose ();
+ if (ds != null) {
+ ds.Exit ();
+ ds.Dispose ();
+ }
}
Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/StackFrameTests.cs
===================================================================
@@ -51,8 +51,10 @@ public override void Setup ()
public override void TearDown ()
{
base.TearDown ();
- ds.Exit ();
- ds.Dispose ();
+ if (ds != null) {
+ ds.Exit ();
+ ds.Dispose ();
+ }
}
public StackFrame Frame {
Commit: 9aeb1b26f772b0db15df861d41367d3290aa6d6d
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-25 17:58:28 GMT
URL: https://github.com/mono/monodevelop/commit/9aeb1b26f772b0db15df861d41367d3290aa6d6d
bumped 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]=39db77384cf55aecbde9830a3425bd4d08f7ddbe
+DEP_NEEDED_VERSION[0]=1c0b7250a4cc8edc3b5523628ca215e8af647de0
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: c745e74a99ab2fce739abe971dd9b2c9f766893a
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-25 19:54:35 GMT
URL: https://github.com/mono/monodevelop/commit/c745e74a99ab2fce739abe971dd9b2c9f766893a
Bump guiunit to fix build on .NET 4.5.1
Changed paths:
M main/external/guiunit
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit ef0578ae17d5efa48aea3a6a28a7a1578201161b
+Subproject commit 55f1f48ab46fe8728beb0bb58118689d26a6452c
Commit: 1d9adfc3dd4736cac6d4e931dc44bd731060bacb
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-25 20:15:45 GMT
URL: https://github.com/mono/monodevelop/commit/1d9adfc3dd4736cac6d4e931dc44bd731060bacb
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]=1c0b7250a4cc8edc3b5523628ca215e8af647de0
+DEP_NEEDED_VERSION[0]=066a55e94fe1ea0cab4f542b7eb5bb3e3f4c3c5c
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: b6c0485fe133fa63e99959c0dfd6eed3dcc27952
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-25 20:18:58 GMT
URL: https://github.com/mono/monodevelop/commit/b6c0485fe133fa63e99959c0dfd6eed3dcc27952
Bump guiunit to fix build on .NET 4.5.1
Conflicts:
main/external/guiunit
Changed paths:
M main/external/guiunit
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit ef0578ae17d5efa48aea3a6a28a7a1578201161b
+Subproject commit 55f1f48ab46fe8728beb0bb58118689d26a6452c
Commit: 1c77d330a7d04442a580f9e938ef41875497a3d4
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-26 00:07:18 GMT
URL: https://github.com/mono/monodevelop/commit/1c77d330a7d04442a580f9e938ef41875497a3d4
Revert "Merge pull request #420 from mono/fixAPI"
This reverts commit fe0d6f373afb019f42ffc93cbd2c4e9cd2f4488a, reversing
changes made to dc227b8c6495c8e3d643fa2d0d4c863eeba415c7.
This will break every third party VCS addin and also our own VCS extensions
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs
===================================================================
@@ -65,7 +65,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class PushCommandHandler: GitCommandHandler
+ class PushCommandHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -73,7 +73,7 @@ protected override void Run ()
}
}
- sealed class SwitchToBranchHandler: GitCommandHandler
+ class SwitchToBranchHandler: GitCommandHandler
{
protected override void Run (object dataItem)
{
@@ -102,7 +102,7 @@ protected override void Update (CommandArrayInfo info)
}
}
- sealed class ManageBranchesHandler: GitCommandHandler
+ class ManageBranchesHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -110,7 +110,7 @@ protected override void Run ()
}
}
- sealed class MergeBranchHandler: GitCommandHandler
+ class MergeBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -118,7 +118,7 @@ protected override void Run ()
}
}
- sealed class RebaseBranchHandler: GitCommandHandler
+ class RebaseBranchHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -126,7 +126,7 @@ protected override void Run ()
}
}
- sealed class StashHandler: GitCommandHandler
+ class StashHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -153,7 +153,7 @@ protected override void Run ()
}
}
- sealed class StashPopHandler: GitCommandHandler
+ class StashPopHandler: GitCommandHandler
{
protected override void Run ()
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class ManageStashesHandler: GitCommandHandler
+ class ManageStashesHandler: GitCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/FilteredStatus.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Git
{
- sealed class FilteredStatus : NGit.Api.StatusCommand
+ class FilteredStatus : NGit.Api.StatusCommand
{
WorkingTreeIterator iter;
IndexDiff diff;
@@ -76,7 +76,7 @@ public override NGit.Api.Status Call ()
return new NGit.Api.Status (diff);
}
- public ICollection<string> GetIgnoredNotInIndex ()
+ public virtual ICollection<string> GetIgnoredNotInIndex ()
{
return diff.GetIgnoredNotInIndex ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitCommitDialogExtension: CommitDialogExtension
+ public class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitCredentials: CredentialsProvider
+ public class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitNodeBuilderExtension: NodeBuilderExtension
+ public class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitOptionsPanel : OptionsPanel
+ public class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
===================================================================
@@ -1713,7 +1713,7 @@ protected override void OnUnignore (FilePath[] localPath)
}
}
- public sealed class GitRevision: Revision
+ public class GitRevision: Revision
{
readonly string rev;
@@ -1753,13 +1753,13 @@ public override Revision GetPrevious ()
}
}
- public sealed class Branch
+ public class Branch
{
public string Name { get; internal set; }
public string Tracking { get; internal set; }
}
- public sealed class RemoteSource
+ public class RemoteSource
{
internal RemoteConfig RepoRemote;
internal StoredConfig cfg;
@@ -1800,7 +1800,7 @@ internal void Update ()
public string PushUrl { get; internal set; }
}
- sealed class GitMonitor: ProgressMonitor, IDisposable
+ class GitMonitor: ProgressMonitor, IDisposable
{
readonly IProgressMonitor monitor;
int currentWork;
@@ -1872,7 +1872,7 @@ public void Dispose ()
}
}
- sealed class LocalGitRepository: FileRepository
+ class LocalGitRepository: FileRepository
{
WeakReference dirCacheRef;
DateTime dirCacheTimestamp;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSelectRevisionDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- sealed class GitSelectRevisionDialog : Xwt.Dialog
+ class GitSelectRevisionDialog : Xwt.Dialog
{
readonly Xwt.TextEntry tagNameEntry;
readonly Xwt.TextEntry tagMessageEntry;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitSupportFeature: ISolutionItemFeature
+ public class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitUtil.cs
===================================================================
@@ -41,7 +41,7 @@
namespace MonoDevelop.VersionControl.Git
{
- static class GitUtil
+ internal static class GitUtil
{
public static string ToGitPath (this NGit.Repository repo, FilePath filePath)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class MyersDiff : GitCommand<IList<DiffEntry>>
+ public class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public MyersDiff SetCached(bool cached)
+ public virtual MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public MyersDiff SetOutputStream(OutputStream @out)
+ public virtual MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public MyersDiff SetContextLines(int contextLines)
+ public virtual MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public MyersDiff SetSourcePrefix(string sourcePrefix)
+ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public MyersDiff SetDestinationPrefix(string destinationPrefix
+ public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs
===================================================================
@@ -38,7 +38,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class Stash
+ public class Stash
{
internal string CommitId { get; private set; }
internal string FullLine { get; private set; }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -64,7 +64,7 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public sealed class LibApr0: LibApr
+ public class LibApr0: LibApr
{
private const string aprlib = "libapr-0.so.0";
@@ -97,7 +97,7 @@ public sealed class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public sealed class LibApr1: LibApr
+ public class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public sealed class LibSvnClient0 : LibSvnClient {
+ public class LibSvnClient0 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public sealed class LibSvnClient1 : LibSvnClient {
+ public class LibSvnClient1 : LibSvnClient {
private const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnRevision.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Subversion
{
- public sealed class SvnRevision : Revision
+ public class SvnRevision : Revision
{
public readonly int Rev;
public readonly int Kind;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlGeneralOptionsPanel.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlGeneralOptionsPanel : OptionsPanel
+ public class VersionControlGeneralOptionsPanel : OptionsPanel
{
Xwt.CheckBox disableVersionControl;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/VersionControlPolicyPanel.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
+ public class VersionControlPolicyPanel: PolicyOptionsPanel<VersionControlPolicy>
{
CommitMessageStylePanelWidget widget;
CommitMessageFormat format;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameView.cs
===================================================================
@@ -34,7 +34,7 @@ public interface IBlameView : IAttachableViewContent
{
}
- sealed class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
+ internal class BlameView : BaseView, IBlameView, IUndoHandler, IClipboardHandler
{
BlameWidget widget;
VersionControlDocumentInfo info;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
===================================================================
@@ -44,7 +44,7 @@ public enum BlameCommands {
ShowLog
}
- public sealed class BlameWidget : Bin
+ public class BlameWidget : Bin
{
Adjustment vAdjustment;
Gtk.VScrollbar vScrollBar;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ChangeSetView.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl.Views
{
[System.ComponentModel.ToolboxItem (true)]
- public sealed class ChangeSetView: ScrolledWindow
+ public class ChangeSetView: ScrolledWindow
{
bool disposed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Views
{
[ToolboxItem (true)]
- public sealed class ComparisonWidget : EditorCompareWidgetBase
+ public class ComparisonWidget : EditorCompareWidgetBase
{
internal DropDownBox originalComboBox, diffComboBox;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffParser.cs
===================================================================
@@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views
/// <summary>
/// Parser for unified diffs
/// </summary>
- public sealed class DiffParser : TypeSystemParser
+ public class DiffParser : TypeSystemParser
{
// Match the original file and time/revstamp line, capturing the filepath and the stamp
static Regex fileHeaderExpression = new Regex (@"^---\s+(?<filepath>[^\t]+)\t(?<stamp>.*)$", RegexOptions.Compiled);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffView.cs
===================================================================
@@ -35,7 +35,7 @@ public interface IDiffView : IAttachableViewContent
{
}
- sealed class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
+ public class DiffView : BaseView, IDiffView, IUndoHandler, IClipboardHandler
{
DiffWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
===================================================================
@@ -35,7 +35,7 @@ namespace MonoDevelop.VersionControl.Views
//FIXME: re-merge this with MonoDevelop.Components.DropDownBox
[Category ("Widgets")]
[ToolboxItem (true)]
- public sealed class DropDownBox : Gtk.Button
+ public class DropDownBox : Gtk.Button
{
Pango.Layout layout;
const int pixbufSpacing = 2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs
===================================================================
@@ -13,7 +13,7 @@ public interface ILogView : IAttachableViewContent
{
}
- sealed class LogView : BaseView, ILogView
+ public class LogView : BaseView, ILogView
{
LogWidget widget;
VersionInfo vinfo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeView.cs
===================================================================
@@ -32,7 +32,7 @@ public interface IMergeView : IAttachableViewContent
{
}
- sealed class MergeView : BaseView, IMergeView
+ class MergeView : BaseView, IMergeView
{
VersionControlDocumentInfo info;
MergeWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
===================================================================
@@ -36,7 +36,7 @@
namespace MonoDevelop.VersionControl.Views
{
- public sealed class MergeWidget : EditorCompareWidgetBase
+ public class MergeWidget : EditorCompareWidgetBase
{
protected override TextEditor MainEditor {
get {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl.Views
{
- sealed class StatusView : BaseView
+ internal class StatusView : BaseView
{
string filepath;
Repository vc;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/SubviewAttachmentHandler.cs
===================================================================
@@ -34,7 +34,7 @@
namespace MonoDevelop.VersionControl.Views
{
- sealed class SubviewAttachmentHandler : CommandHandler
+ class SubviewAttachmentHandler : CommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/AddRemoveMoveCommand.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class AddCommand
+ internal class AddCommand
{
public static bool Add (VersionControlItemList items, bool test)
{
@@ -17,7 +17,7 @@ public static bool Add (VersionControlItemList items, bool test)
return true;
}
- class AddWorker : Task {
+ private class AddWorker : Task {
VersionControlItemList items;
public AddWorker (VersionControlItemList items)
@@ -92,7 +92,7 @@ protected override void Run ()
//
// }
- sealed class RemoveCommand
+ internal class RemoveCommand
{
public static bool Remove (VersionControlItemList items, bool test)
{
@@ -108,7 +108,7 @@ public static bool Remove (VersionControlItemList items, bool test)
return true;
}
- class RemoveWorker : Task {
+ private class RemoveWorker : Task {
VersionControlItemList items;
public RemoveWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BaseView.cs
===================================================================
@@ -4,11 +4,11 @@
namespace MonoDevelop.VersionControl
{
- abstract class BaseView : AbstractBaseViewContent, IViewContent
+ public abstract class BaseView : AbstractBaseViewContent, IViewContent
{
string name;
- protected BaseView (string name)
+ public BaseView (string name)
{
this.name = name;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class BlameCommand
+ public class BlameCommand
{
internal static readonly string BlameViewHandlers = "/MonoDevelop/VersionControl/BlameViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ChangeLogWriter.cs
===================================================================
@@ -36,10 +36,10 @@
namespace MonoDevelop.VersionControl
{
- sealed class ChangeLogWriter
+ class ChangeLogWriter
{
- Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
- string changelog_path;
+ private Dictionary<string, List<string>> messages = new Dictionary<string, List<string>> ();
+ private string changelog_path;
AuthorInformation uinfo;
public ChangeLogWriter (string path, AuthorInformation uinfo)
@@ -69,7 +69,7 @@ public void AddFile (string message, string path)
}
}
- string GetRelativeEntryPath (string path)
+ private string GetRelativeEntryPath (string path)
{
if (!path.StartsWith (changelog_path, System.StringComparison.Ordinal)) {
return null;
@@ -85,13 +85,13 @@ public override string ToString ()
CommitMessageStyle message_style = MessageFormat.Style;
- var formatter = new TextFormatter ();
+ TextFormatter formatter = new TextFormatter ();
formatter.MaxColumns = MessageFormat.MaxColumns;
formatter.TabWidth = MessageFormat.TabWidth;
formatter.TabsAsSpaces = MessageFormat.TabsAsSpaces;
if (message_style.Header.Length > 0) {
- string [,] tags = { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
+ string [,] tags = new string[,] { {"AuthorName", uinfo.Name}, {"AuthorEmail", uinfo.Email} };
formatter.Append (StringParserService.Parse (message_style.Header, tags));
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class CheckoutCommand : CommandHandler
+ internal class CheckoutCommand : CommandHandler
{
protected override void Update (CommandInfo info)
{
@@ -25,79 +25,79 @@ protected override void Run()
del.Destroy ();
}
}
-
- class CheckoutWorker : Task
+ }
+
+ class CheckoutWorker : Task
+ {
+ Repository vc;
+ string path;
+
+ public CheckoutWorker (Repository vc, string path)
{
- Repository vc;
- string path;
-
- public CheckoutWorker (Repository vc, string path)
- {
- this.vc = vc;
- this.path = path;
- OperationType = VersionControlOperationType.Pull;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Checking out {0}...", path);
+ this.vc = vc;
+ this.path = path;
+ OperationType = VersionControlOperationType.Pull;
+ }
+
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Checking out {0}...", path);
+ }
+
+ protected override IProgressMonitor CreateProgressMonitor ()
+ {
+ return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
+ base.CreateProgressMonitor (),
+ new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
+ );
+ }
+
+ protected override void Run ()
+ {
+ vc.Checkout (path, null, true, Monitor);
+ if (Monitor.IsCancelRequested) {
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
+ return;
}
- protected override IProgressMonitor CreateProgressMonitor ()
- {
- return new MonoDevelop.Core.ProgressMonitoring.AggregatedProgressMonitor (
- base.CreateProgressMonitor (),
- new MonoDevelop.Ide.ProgressMonitoring.MessageDialogProgressMonitor (true, true, true, true)
- );
+ if (!System.IO.Directory.Exists (path)) {
+ Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
+ return;
}
- protected override void Run ()
- {
- vc.Checkout (path, null, true, Monitor);
- if (Monitor.IsCancelRequested) {
- Monitor.ReportSuccess (GettextCatalog.GetString ("Checkout operation cancelled"));
- return;
- }
-
- if (!System.IO.Directory.Exists (path)) {
- Monitor.ReportError (GettextCatalog.GetString ("Checkout folder does not exist"), null);
- return;
+ string projectFn = null;
+
+ string[] list = System.IO.Directory.GetFiles(path);
+ foreach (string str in list ) {
+ if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
}
-
- string projectFn = null;
-
- string[] list = System.IO.Directory.GetFiles(path);
+ }
+ if ( projectFn == null ) {
+ foreach ( string str in list ) {
+ if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
+ projectFn = str;
+ break;
+ }
+ }
+ }
+ if ( projectFn == null ) {
foreach (string str in list ) {
- if (str.EndsWith (".mds", System.StringComparison.Ordinal)) {
+ if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
projectFn = str;
break;
}
- }
- if ( projectFn == null ) {
- foreach ( string str in list ) {
- if (str.EndsWith (".mdp", System.StringComparison.Ordinal)) {
- projectFn = str;
- break;
- }
- }
- }
- if ( projectFn == null ) {
- foreach (string str in list ) {
- if (MonoDevelop.Projects.Services.ProjectService.IsWorkspaceItemFile (str)) {
- projectFn = str;
- break;
- }
- }
- }
-
- if (projectFn != null) {
- DispatchService.GuiDispatch (delegate {
- IdeApp.Workspace.OpenWorkspaceItem (projectFn);
- });
- }
-
- Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
+ }
+ }
+
+ if (projectFn != null) {
+ DispatchService.GuiDispatch (delegate {
+ IdeApp.Workspace.OpenWorkspaceItem (projectFn);
+ });
}
+
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Solution checked out"));
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Commands.cs
===================================================================
@@ -129,7 +129,7 @@ protected virtual bool RunCommand (VersionControlItemList items, bool test)
}
}
- sealed class UpdateCommandHandler: SolutionVersionControlCommandHandler
+ class UpdateCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -137,7 +137,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- sealed class StatusCommandHandler: SolutionVersionControlCommandHandler
+ class StatusCommandHandler: SolutionVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -145,7 +145,7 @@ protected override bool RunCommand (VersionControlItemList items, bool test)
}
}
- sealed class AddCommandHandler: FileVersionControlCommandHandler
+ class AddCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -159,7 +159,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class RemoveCommandHandler: FileVersionControlCommandHandler
+ class RemoveCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -173,7 +173,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class RevertCommandHandler: FileVersionControlCommandHandler
+ class RevertCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -187,7 +187,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class LockCommandHandler: FileVersionControlCommandHandler
+ class LockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -201,7 +201,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class UnlockCommandHandler: FileVersionControlCommandHandler
+ class UnlockCommandHandler: FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -215,7 +215,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class IgnoreCommandHandler : FileVersionControlCommandHandler
+ class IgnoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -229,7 +229,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class UnignoreCommandHandler : FileVersionControlCommandHandler
+ class UnignoreCommandHandler : FileVersionControlCommandHandler
{
protected override bool RunCommand (VersionControlItemList items, bool test)
{
@@ -243,7 +243,7 @@ protected override void Update (CommandInfo info)
}
}
- sealed class CurrentFileDiffHandler : FileVersionControlCommandHandler
+ class CurrentFileDiffHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -252,7 +252,7 @@ protected override void Run ()
}
}
- sealed class CurrentFileBlameHandler : FileVersionControlCommandHandler
+ class CurrentFileBlameHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
@@ -261,7 +261,7 @@ protected override void Run ()
}
}
- sealed class CurrentFileLogHandler : FileVersionControlCommandHandler
+ class CurrentFileLogHandler : FileVersionControlCommandHandler
{
protected override void Run ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- static class CommitCommand
+ class CommitCommand
{
public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
{
@@ -49,7 +49,7 @@ public static bool Commit (Repository vc, ChangeSet changeSet, bool test)
}
}
- class CommitWorker : Task
+ private class CommitWorker : Task
{
Repository vc;
ChangeSet changeSet;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CreatePatchCommand.cs
===================================================================
@@ -39,7 +39,7 @@ namespace MonoDevelop.VersionControl
/// <summary>
/// Class for creating patches from VersionControlItems
/// </summary>
- static class CreatePatchCommand
+ public class CreatePatchCommand
{
/// <summary>
/// Creates a patch from a VersionControlItemList
@@ -56,8 +56,7 @@ static class CreatePatchCommand
public static bool CreatePatch (VersionControlItemList items, bool test)
{
bool can = CanCreatePatch (items);
- if (test || !can)
- return can;
+ if (test || !can){ return can; }
FilePath basePath = items.FindMostSpecificParent ();
if (FilePath.Null == basePath)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultBlameViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultBlameViewHandler : IBlameViewHandler
+ public class DefaultBlameViewHandler : IBlameViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultDiffViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultDiffViewHandler : IDiffViewHandler
+ public class DefaultDiffViewHandler : IDiffViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultLogViewHandler.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultLogViewHandler : ILogViewHandler
+ public class DefaultLogViewHandler : ILogViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DefaultMergeViewHandler.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class DefaultMergeViewHandler : IMergeViewHandler
+ public class DefaultMergeViewHandler : IMergeViewHandler
{
public bool CanHandle (VersionControlItem item, DocumentView primaryView)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class DiffCommand
+ public class DiffCommand
{
internal static readonly string DiffViewHandlers = "/MonoDevelop/VersionControl/DiffViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/IgnoreCommand.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- static class IgnoreCommand
+ class IgnoreCommand
{
public static bool Ignore (VersionControlItemList items, bool test)
{
@@ -62,7 +62,7 @@ static bool IgnoreInternal (VersionControlItemList items, bool test)
}
}
- class IgnoreWorker : Task
+ private class IgnoreWorker : Task
{
VersionControlItemList items;
@@ -93,7 +93,7 @@ protected override void Run ()
}
}
- static class UnignoreCommand
+ class UnignoreCommand
{
public static bool Unignore (VersionControlItemList items, bool test)
{
@@ -125,7 +125,7 @@ static bool UnignoreInternal (VersionControlItemList items, bool test)
}
}
- class UnignoreWorker : Task
+ private class UnignoreWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LockCommand.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- static class LockCommand
+ public class LockCommand
{
public static bool Lock (VersionControlItemList items, bool test)
{
@@ -43,7 +43,7 @@ public static bool Lock (VersionControlItemList items, bool test)
return true;
}
- class LockWorker : Task
+ private class LockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/LogCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class LogCommand
+ public class LogCommand
{
internal static readonly string LogViewHandlers = "/MonoDevelop/VersionControl/LogViewHandler";
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/MergeCommand.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class MergeCommand
+ public class MergeCommand
{
internal static readonly string MergeViewHandlers = "/MonoDevelop/VersionControl/MergeViewHandler";
@@ -42,7 +42,7 @@ static bool CanShow (VersionControlItem item)
&& item.VersionInfo.IsVersioned
&& AddinManager.GetExtensionObjects<IMergeViewHandler> (MergeViewHandlers).Any (h => h.CanHandle (item, null));
}
-
+
public static bool Show (VersionControlItemList items, bool test)
{
if (test)
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
===================================================================
@@ -8,7 +8,7 @@
namespace MonoDevelop.VersionControl
{
- static class PublishCommand
+ internal class PublishCommand
{
public static bool Publish (IWorkspaceObject entry, FilePath localPath, bool test)
{
@@ -67,38 +67,38 @@ static void GetFiles (List<FilePath> files, IWorkspaceObject entry)
return true;
return false;
}
+ }
+
+ internal class PublishWorker : Task {
+ Repository vc;
+ FilePath path;
+ string moduleName;
+ FilePath[] files;
+ string message;
+
+ public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
+ {
+ this.vc = vc;
+ this.path = localPath;
+ this.moduleName = moduleName;
+ this.files = files;
+ this.message = message;
+ OperationType = VersionControlOperationType.Push;
+ }
- class PublishWorker : Task {
- Repository vc;
- FilePath path;
- string moduleName;
- FilePath[] files;
- string message;
-
- public PublishWorker (Repository vc, string moduleName, FilePath localPath, FilePath[] files, string message)
- {
- this.vc = vc;
- this.path = localPath;
- this.moduleName = moduleName;
- this.files = files;
- this.message = message;
- OperationType = VersionControlOperationType.Push;
- }
-
- protected override string GetDescription ()
- {
- return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
- }
-
- protected override void Run ()
- {
- vc.Publish (moduleName, path, files, message, Monitor);
- Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
-
- Gtk.Application.Invoke (delegate {
- VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
- });
- }
+ protected override string GetDescription ()
+ {
+ return GettextCatalog.GetString ("Publishing \"{0}\" Project...", moduleName);
+ }
+
+ protected override void Run ()
+ {
+ vc.Publish (moduleName, path, files, message, Monitor);
+ Monitor.ReportSuccess (GettextCatalog.GetString ("Publish operation completed."));
+
+ Gtk.Application.Invoke (delegate {
+ VersionControlService.NotifyFileStatusChanged (new FileUpdateEventArgs (vc, path, true));
+ });
}
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs
===================================================================
@@ -29,12 +29,12 @@ public FilePath RootPath
public event EventHandler NameChanged;
- protected Repository ()
+ public Repository ()
{
infoCache = new VersionInfoCache (this);
}
- protected Repository (VersionControlSystem vcs): this ()
+ public Repository (VersionControlSystem vcs): this ()
{
VersionControlSystem = vcs;
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/ResolveConflictsCommand.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- static class ResolveConflictsCommand
+ public class ResolveConflictsCommand
{
public static bool ResolveConflicts (VersionControlItemList list, bool test)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertCommand.cs
===================================================================
@@ -7,8 +7,9 @@
namespace MonoDevelop.VersionControl
{
- static class RevertCommand
+ internal class RevertCommand
{
+
public static bool Revert (VersionControlItemList items, bool test)
{
if (RevertInternal (items, test)) {
@@ -19,7 +20,7 @@ public static bool Revert (VersionControlItemList items, bool test)
return false;
}
- static bool RevertInternal (VersionControlItemList items, bool test)
+ private static bool RevertInternal (VersionControlItemList items, bool test)
{
try {
if (test)
@@ -42,22 +43,22 @@ static bool RevertInternal (VersionControlItemList items, bool test)
}
}
- class RevertWorker : Task {
+ private class RevertWorker : Task {
VersionControlItemList items;
-
+
public RevertWorker (VersionControlItemList items) {
this.items = items;
}
-
+
protected override string GetDescription() {
return GettextCatalog.GetString ("Reverting ...");
}
-
+
protected override void Run ()
{
foreach (VersionControlItemList list in items.SplitByRepository ())
list[0].Repository.Revert (list.Paths, true, Monitor);
-
+
Monitor.ReportSuccess (GettextCatalog.GetString ("Revert operation completed."));
Gtk.Application.Invoke (delegate {
foreach (VersionControlItem item in items) {
@@ -73,5 +74,6 @@ protected override void Run ()
});
}
}
+
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/RevertRevisionsCommands.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl
{
- static class RevertRevisionsCommands
+ internal class RevertRevisionsCommands
{
public static bool RevertRevision (Repository vc, string path, Revision revision, bool test)
{
@@ -75,7 +75,7 @@ private static bool RevertRevisions (Repository vc, string path, Revision revisi
}
}
- class RevertWorker : Task {
+ private class RevertWorker : Task {
Repository vc;
string path;
Revision revision;
@@ -130,5 +130,6 @@ protected override void Run ()
});
}
}
+
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Task.cs
===================================================================
@@ -6,7 +6,7 @@
namespace MonoDevelop.VersionControl
{
- abstract class Task
+ internal abstract class Task
{
IProgressMonitor tracker;
ThreadNotify threadnotify;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnknownRepository.cs
===================================================================
@@ -7,7 +7,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class UnknownRepository: Repository, IExtendedDataItem
+ public class UnknownRepository: Repository, IExtendedDataItem
{
Hashtable properties;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UnlockCommand.cs
===================================================================
@@ -32,7 +32,7 @@ namespace MonoDevelop.VersionControl
{
- static class UnlockCommand
+ public class UnlockCommand
{
public static bool Unlock (VersionControlItemList items, bool test)
{
@@ -45,7 +45,7 @@ public static bool Unlock (VersionControlItemList items, bool test)
return true;
}
- class UnlockWorker : Task
+ private class UnlockWorker : Task
{
VersionControlItemList items;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UpdateCommand.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- static class UpdateCommand
+ internal class UpdateCommand
{
public static bool Update (VersionControlItemList items, bool test)
{
@@ -16,7 +16,7 @@ public static bool Update (VersionControlItemList items, bool test)
return true;
}
- class UpdateWorker : Task {
+ private class UpdateWorker : Task {
VersionControlItemList items;
public UpdateWorker (VersionControlItemList items) {
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/UrlBasedRepository.cs
===================================================================
@@ -9,11 +9,11 @@ public abstract class UrlBasedRepository: Repository, ICustomDataItem
string url;
Uri uri;
- protected UrlBasedRepository ()
+ public UrlBasedRepository ()
{
}
- protected UrlBasedRepository (VersionControlSystem vcs): base (vcs)
+ public UrlBasedRepository (VersionControlSystem vcs): base (vcs)
{
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlConfiguration.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class VersionControlConfiguration
+ class VersionControlConfiguration
{
[ItemProperty ("Repositories")]
List<Repository> repositories = new List<Repository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlFileSystemExtension.cs
===================================================================
@@ -10,7 +10,7 @@
namespace MonoDevelop.VersionControl
{
- class VersionControlFileSystemExtension: FileSystemExtension
+ internal class VersionControlFileSystemExtension: FileSystemExtension
{
public override bool CanHandlePath (FilePath path, bool isDirectory)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlItem
+ public class VersionControlItem
{
FilePath path;
bool isDirectory;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItemList.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionControlItemList: List<VersionControlItem>
+ public class VersionControlItemList: List<VersionControlItem>
{
public VersionControlItemList[] SplitByRepository ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlNodeExtension.cs
===================================================================
@@ -251,7 +251,7 @@ internal static string GetPath (object dataObject)
- sealed class AddinCommandHandler : VersionControlCommandHandler
+ class AddinCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (Commands.Update)]
@@ -428,7 +428,7 @@ protected void UpdateResolveConflicts (CommandInfo item)
TestCommand (Commands.ResolveConflicts, item, false);
}
- void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
+ private void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
{
TestResult res = RunCommand(cmd, true, projRecurse);
if (res == TestResult.NoVersionControl && cmd == Commands.Log) {
@@ -443,7 +443,7 @@ void TestCommand(Commands cmd, CommandInfo item, bool projRecurse = true)
item.Visible = res == TestResult.Enable;
}
- TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
+ private TestResult RunCommand (Commands cmd, bool test, bool projRecurse = true)
{
VersionControlItemList items = GetItems (projRecurse);
@@ -530,7 +530,7 @@ public override void RefreshItem ()
}
}
- sealed class OpenCommandHandler : VersionControlCommandHandler
+ class OpenCommandHandler : VersionControlCommandHandler
{
[AllowMultiSelection]
[CommandHandler (ViewCommands.Open)]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlPolicy.cs
===================================================================
@@ -33,7 +33,7 @@ namespace MonoDevelop.VersionControl
{
[PolicyType ("Version control commit message style")]
[DataItem ("VersionControlPolicy")]
- public sealed class VersionControlPolicy: IEquatable<VersionControlPolicy>
+ public class VersionControlPolicy: IEquatable<VersionControlPolicy>
{
public VersionControlPolicy()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlService.cs
===================================================================
@@ -19,7 +19,7 @@
namespace MonoDevelop.VersionControl
{
- public static class VersionControlService
+ public class VersionControlService
{
static Gdk.Pixbuf overlay_modified;
static Gdk.Pixbuf overlay_removed;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfo.cs
===================================================================
@@ -3,7 +3,7 @@
namespace MonoDevelop.VersionControl
{
- public sealed class VersionInfo
+ public class VersionInfo
{
FilePath localPath;
string repositoryPath;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionInfoCache.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl
{
- sealed class VersionInfoCache
+ class VersionInfoCache
{
Dictionary<FilePath,VersionInfo> fileStatus = new Dictionary<FilePath, VersionInfo> ();
Dictionary<FilePath,DirectoryStatus> directoryStatus = new Dictionary<FilePath, DirectoryStatus> ();
@@ -137,7 +137,7 @@ public void SetDirectoryStatus (FilePath localDirectory, VersionInfo[] versionIn
}
}
- sealed class DirectoryStatus
+ class DirectoryStatus
{
public VersionInfo[] FileInfo { get; set; }
public bool HasRemoteStatus { get; set; }
Commit: ca3c6ed016cdbea2bb14fdf6d0b4f93c63f503c2
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-26 00:14:10 GMT
URL: https://github.com/mono/monodevelop/commit/ca3c6ed016cdbea2bb14fdf6d0b4f93c63f503c2
bump md-addins to tip of license-sync
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]=066a55e94fe1ea0cab4f542b7eb5bb3e3f4c3c5c
+DEP_NEEDED_VERSION[0]=6cf39b2647d7151ffd2d1863ed4d5b263e9a7a29
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: f4fe4a210e470d5c990fd66339e7281b74e12646
Author: Alex Corrado <[email protected]> (chkn)
Date: 2013-10-26 03:05:58 GMT
URL: https://github.com/mono/monodevelop/commit/f4fe4a210e470d5c990fd66339e7281b74e12646
[build] Bump xwt and md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 4b0970039983644acdecc85ff30699bc627a4bab
+Subproject commit 6f77443b6b17bddb3b812499ccb5a660b0015466
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]=6cf39b2647d7151ffd2d1863ed4d5b263e9a7a29
+DEP_NEEDED_VERSION[0]=5f543a3d9ff22681f4f6def6fe37caede45f50c1
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 4f624f8183cbd73ced292084eab1df8879d3c111
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-26 21:41:30 GMT
URL: https://github.com/mono/monodevelop/commit/4f624f8183cbd73ced292084eab1df8879d3c111
[build] Ensure configure/Makefile are always checked out as lf
They must be lf so they execute correctly.
Changed paths:
M .gitattributes
M version-checks
Modified: .gitattributes
===================================================================
@@ -17,6 +17,15 @@
# sln is always CRLF, even on linux, so don't convert
*.sln -crlf
+# configure and makefiles should be lf only
+configure
+configure.in
+configure.ac
+configure.sh
+Makefile
+Makefile.am
+Makefile.include
+
# These files can be converted, since they're new
.gitattributes crlf
.gitignore crlf
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]=9942fff39e0adb4ea244c1c8e5ded1e2a70c7897
+DEP_NEEDED_VERSION[0]=f7c14625c197d1925df508d15d3eb9104df2a73c
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 2cdebb496461c25f9476e50f7252e14403a1e7db
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-26 21:43:54 GMT
URL: https://github.com/mono/monodevelop/commit/2cdebb496461c25f9476e50f7252e14403a1e7db
[build] Ensure configure/Makefile are always checked out as lf
They must be lf so they execute correctly.
Conflicts:
version-checks
Changed paths:
M .gitattributes
Modified: .gitattributes
===================================================================
@@ -17,6 +17,15 @@
# sln is always CRLF, even on linux, so don't convert
*.sln -crlf
+# configure and makefiles should be lf only
+configure
+configure.in
+configure.ac
+configure.sh
+Makefile
+Makefile.am
+Makefile.include
+
# These files can be converted, since they're new
.gitattributes crlf
.gitignore crlf
Commit: 0fad750c48a294934b8917952e6f1702e854efd4
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-26 21:44:12 GMT
URL: https://github.com/mono/monodevelop/commit/0fad750c48a294934b8917952e6f1702e854efd4
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]=5f543a3d9ff22681f4f6def6fe37caede45f50c1
+DEP_NEEDED_VERSION[0]=e80c43902484b168aa029535d90441e2157c4312
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 483a457975de4f81dcceda1e16746f53be1bbf7c
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 01:37:29 GMT
URL: https://github.com/mono/monodevelop/commit/483a457975de4f81dcceda1e16746f53be1bbf7c
Bump md-addins for some test harness 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]=f7c14625c197d1925df508d15d3eb9104df2a73c
+DEP_NEEDED_VERSION[0]=d0a8f0e529df0e446c4be55bc856353f86e9116b
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 6fe2cdac4111c9e4fa23729940abeb89ed9d600a
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 01:43:00 GMT
URL: https://github.com/mono/monodevelop/commit/6fe2cdac4111c9e4fa23729940abeb89ed9d600a
Bump md-addins for some test harness 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]=e80c43902484b168aa029535d90441e2157c4312
+DEP_NEEDED_VERSION[0]=0cd6bad21aa99f5a6cb361f0eca877382bff961e
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: b80a370969847f3879bd685ada587f338a28d3de
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-27 04:09:55 GMT
URL: https://github.com/mono/monodevelop/commit/b80a370969847f3879bd685ada587f338a28d3de
[UnitTests] Fixed some failing tests on windows.
Changed paths:
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/ClipboardTests.cs
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/HtmlWriterTests.cs
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/RtfWriterTests.cs
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/ClipboardTests.cs
===================================================================
@@ -88,6 +88,7 @@ public void TestUndoSteps ()
public void TestPasteDoesntInsertVirtualIndent ()
{
var data = VirtualIndentModeTests.CreateData ("");
+ data.Options.DefaultEolMarker = "\n";
data.Caret.Location = new DocumentLocation (1, data.IndentationTracker.GetVirtualIndentationColumn (1, 1));
var clipboard = Clipboard.Get (Mono.TextEditor.ClipboardActions.CopyOperation.CLIPBOARD_ATOM);
clipboard.Text = "\n\n";
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/HtmlWriterTests.cs
===================================================================
@@ -36,6 +36,8 @@ public class HtmlWriterTests : TextEditorTestBase
[Test]
public void TestSimpleCSharpHtml ()
{
+ if (Platform.IsWindows)
+ return;
var data = Create ("class Foo {}");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
data.Document.SyntaxMode = SyntaxModeService.GetSyntaxMode (data.Document, "text/x-csharp");
@@ -57,6 +59,8 @@ public void TestSimpleCSharpHtml ()
[Test]
public void TestXml ()
{
+ if (Platform.IsWindows)
+ return;
var data = Create (
@"<foo
attr1 = ""1""
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/RtfWriterTests.cs
===================================================================
@@ -36,6 +36,8 @@ public class RtfWriterTests : TextEditorTestBase
[Test]
public void TestSimpleCSharpRtf ()
{
+ if (Platform.IsWindows)
+ return;
var data = Create ("class Foo {}");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
data.Document.SyntaxMode = SyntaxModeService.GetSyntaxMode (data.Document, "text/x-csharp");
@@ -58,6 +60,8 @@ public void TestSimpleCSharpRtf ()
[Test]
public void TestBug5628 ()
{
+ if (Platform.IsWindows)
+ return;
var data = Create ("class Foo {}");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
string generatedRtf = RtfWriter.GenerateRtf (data);
@@ -79,6 +83,8 @@ public void TestBug5628 ()
[Test]
public void TestBug7386 ()
{
+ if (Platform.IsWindows)
+ return;
var data = Create ("✔");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
string generatedRtf = RtfWriter.GenerateRtf (data);
@@ -98,6 +104,8 @@ public void TestBug7386 ()
[Test]
public void TestXml ()
{
+ if (Platform.IsWindows)
+ return;
var data = Create (
@"<foo
attr1 = ""1""
Commit: 45cc9393e07c94123d1f394d8431595772331324
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 04:17:40 GMT
URL: https://github.com/mono/monodevelop/commit/45cc9393e07c94123d1f394d8431595772331324
[TestRunner] Do not reference guiunit at all
The test runner cannot reference guiunit by binary or project reference
as if we use any types from the 'guiunit' assembly we will not be able
to run any tests from a test assembly which references a different
guiunit.
The runner was written specifically to dynamically load guiunit.exe
at runtime and access the required types via reflection to avoid this.
Changed paths:
M main/tests/TestRunner/TestRunner.csproj
Modified: main/tests/TestRunner/TestRunner.csproj
===================================================================
@@ -63,10 +63,6 @@
<Name>Mono.Addins</Name>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\external\guiunit\src\framework\GuiUnit_NET_4_0.csproj">
- <Project>{E13A0A7B-4DE6-43ED-A139-41052D065A9B}</Project>
- <Name>GuiUnit_NET_4_0</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MonoDevelop.TestRunner.addin.xml">
Commit: d8809f0c58f28a6f53d3b5e4cc5ae13c8e08fc39
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-27 05:21:49 GMT
URL: https://github.com/mono/monodevelop/commit/d8809f0c58f28a6f53d3b5e4cc5ae13c8e08fc39
Bump nrefactory/fixed tests.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit f0323dda60817169e7ac815c288a8dea47f5051d
+Subproject commit 4546b5782ae47fda9b748952e33dfb990574e5d9
Commit: 4aafc94b3f8ce7f5d6ecb82928d9a2ecbe55af17
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 05:47:14 GMT
URL: https://github.com/mono/monodevelop/commit/4aafc94b3f8ce7f5d6ecb82928d9a2ecbe55af17
Bump md-addins and guiunit
Changed paths:
M main/external/guiunit
M version-checks
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 55f1f48ab46fe8728beb0bb58118689d26a6452c
+Subproject commit 05e006597ceb366b9d84c95b88647dc275ddd32e
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]=0cd6bad21aa99f5a6cb361f0eca877382bff961e
+DEP_NEEDED_VERSION[0]=f2e42f74be68fcf866c390c6177458747f79a3b8
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 83c1505c42589739734fe3a80968a30dc658f510
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-27 06:10:31 GMT
URL: https://github.com/mono/monodevelop/commit/83c1505c42589739734fe3a80968a30dc658f510
[Git] Switch many classes to internal, since they don't need to be public.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditRemoteDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitClient.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/NewStashDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/PushDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserGitConfigDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditBranchDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditRemoteDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitCommitDialogExtensionWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitConfigurationDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitOptionsPanelWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.NewStashDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.StashManagerDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class CredentialsDialog : Gtk.Dialog
+ partial class CredentialsDialog : Gtk.Dialog
{
readonly CredentialItem.YesNoType singleYesNoCred;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditBranchDialog : Dialog
+ partial class EditBranchDialog : Dialog
{
readonly ListStore comboStore;
readonly string currentTracking;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditRemoteDialog.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditRemoteDialog : Gtk.Dialog
+ partial class EditRemoteDialog : Gtk.Dialog
{
readonly RemoteSource remote;
readonly bool updating;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitClient.cs
===================================================================
@@ -26,7 +26,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitClient : GitVersionControl
+ sealed class GitClient : GitVersionControl
{
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCommitDialogExtension: CommitDialogExtension
+ sealed class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Git
{
[System.ComponentModel.ToolboxItem(true)]
- public partial class GitCommitDialogExtensionWidget : Gtk.Bin
+ partial class GitCommitDialogExtensionWidget : Gtk.Bin
{
public GitCommitDialogExtensionWidget ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitConfigurationDialog : Dialog
+ partial class GitConfigurationDialog : Dialog
{
readonly GitRepository repo;
readonly ListStore storeBranches;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCredentials: CredentialsProvider
+ sealed class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitNodeBuilderExtension: NodeBuilderExtension
+ sealed class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitOptionsPanel : OptionsPanel
+ sealed class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
[System.ComponentModel.ToolboxItem(true)]
- public partial class GitOptionsPanelWidget : Gtk.Bin
+ partial class GitOptionsPanelWidget : Gtk.Bin
{
public GitOptionsPanelWidget ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitSupportFeature: ISolutionItemFeature
+ sealed class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public abstract class GitVersionControl : VersionControlSystem
+ abstract class GitVersionControl : VersionControlSystem
{
readonly Dictionary<FilePath,GitRepository> repositories = new Dictionary<FilePath,GitRepository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class MergeDialog : Dialog
+ partial class MergeDialog : Dialog
{
readonly TreeStore store;
readonly GitRepository repo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class MyersDiff : GitCommand<IList<DiffEntry>>
+ sealed class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/NewStashDialog.cs
===================================================================
@@ -26,7 +26,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class NewStashDialog : Gtk.Dialog
+ partial class NewStashDialog : Gtk.Dialog
{
public NewStashDialog ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/PushDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class PushDialog : Gtk.Dialog
+ partial class PushDialog : Gtk.Dialog
{
readonly GitRepository repo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class StashManagerDialog : Dialog
+ partial class StashManagerDialog : Dialog
{
readonly ListStore store;
readonly StashCollection stashes;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserGitConfigDialog.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserGitConfigDialog : Gtk.Dialog
+ partial class UserGitConfigDialog : Gtk.Dialog
{
public UserGitConfigDialog ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserInfoConflictDialog : Gtk.Dialog
+ partial class UserInfoConflictDialog : Gtk.Dialog
{
public UserInfoConflictDialog (string mdInfo, string gitInfo)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class CredentialsDialog
+ internal partial class CredentialsDialog
{
private global::Gtk.VBox vbox;
private global::Gtk.Label labelTop;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditBranchDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditBranchDialog
+ internal partial class EditBranchDialog
{
private global::Gtk.VBox vbox5;
private global::Gtk.Table table4;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditRemoteDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditRemoteDialog
+ internal partial class EditRemoteDialog
{
private global::Gtk.VBox vbox7;
private global::Gtk.Table table3;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitCommitDialogExtensionWidget.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitCommitDialogExtensionWidget
+ internal partial class GitCommitDialogExtensionWidget
{
private global::Gtk.VBox vbox1;
private global::Gtk.CheckButton checkPush;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitConfigurationDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitConfigurationDialog
+ internal partial class GitConfigurationDialog
{
private global::Gtk.Notebook notebook1;
private global::Gtk.VBox vbox2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitOptionsPanelWidget.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitOptionsPanelWidget
+ internal partial class GitOptionsPanelWidget
{
private global::Gtk.VBox vbox2;
private global::Gtk.CheckButton checkStashBranch;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class MergeDialog
+ internal partial class MergeDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label labelHeader;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.NewStashDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class NewStashDialog
+ partial class NewStashDialog
{
private global::Gtk.HBox hbox3;
private global::Gtk.Label label3;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class PushDialog
+ internal partial class PushDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.HBox hbox1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.StashManagerDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class StashManagerDialog
+ internal partial class StashManagerDialog
{
private global::Gtk.HBox hbox2;
private global::Gtk.ScrolledWindow GtkScrolledWindow;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserGitConfigDialog
+ internal partial class UserGitConfigDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.VBox vbox5;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserInfoConflictDialog
+ internal partial class UserInfoConflictDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
===================================================================
@@ -13,6 +13,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.PushDialog" design-size="730 540">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Push to Repository</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -150,6 +151,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.UserInfoConflictDialog" design-size="529 249">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">User Information Conflict</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -431,6 +433,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.GitConfigurationDialog" design-size="602 410">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Git Repository Configuration</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">1</property>
@@ -849,6 +852,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.EditBranchDialog" design-size="400 200">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Branch Properties</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -1031,6 +1035,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.EditRemoteDialog" design-size="422 206">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Remote Source</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -1256,6 +1261,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.MergeDialog" design-size="469 487">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
@@ -1383,6 +1389,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.CredentialsDialog" design-size="500 132">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Git Credentials</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">4</property>
@@ -1502,6 +1509,7 @@
<widget class="Gtk.Bin" id="MonoDevelop.VersionControl.Git.GitOptionsPanelWidget" design-size="391 300">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<child>
<widget class="Gtk.VBox" id="vbox2">
<property name="MemberName" />
@@ -1596,6 +1604,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.StashManagerDialog" design-size="575 367">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Stash Manager</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">1</property>
@@ -1749,6 +1758,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.NewStashDialog" design-size="412 114">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Stash</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -1842,6 +1852,7 @@
<widget class="Gtk.Bin" id="MonoDevelop.VersionControl.Git.GitCommitDialogExtensionWidget" design-size="319 114">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<child>
<widget class="Gtk.VBox" id="vbox1">
<property name="MemberName" />
@@ -1988,6 +1999,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.UserGitConfigDialog" design-size="400 184">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
Commit: 1201d724a02512574949b89db5a38f5e62e3ed98
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-27 06:11:13 GMT
URL: https://github.com/mono/monodevelop/commit/1201d724a02512574949b89db5a38f5e62e3ed98
[Subversion] Switch many classes to internal, since they don't need to be public.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
M main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs
===================================================================
@@ -50,3 +50,4 @@
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
+[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Tests")]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix
{
- public abstract class LibApr
+ abstract class LibApr
{
public static readonly int APR_OS_DEFAULT = 0xFFF;
public static readonly int APR_WRITE = 2;
@@ -31,7 +31,7 @@ public static LibApr GetLib (int ver)
}
}
- public LibApr ()
+ protected LibApr ()
{
initialize ();
}
@@ -64,9 +64,9 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
+ sealed class LibApr0: LibApr
{
- private const string aprlib = "libapr-0.so.0";
+ const string aprlib = "libapr-0.so.0";
public override int initialize() { return apr_initialize (); }
public override int pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
@@ -97,9 +97,9 @@ public class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public class LibApr1: LibApr
+ sealed class LibApr1: LibApr
{
- private const string aprlib = "libapr-1.so.0";
+ const string aprlib = "libapr-1.so.0";
public override int initialize() { return apr_initialize (); }
public override int pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs
===================================================================
@@ -12,8 +12,8 @@
using size_t = System.Int32;
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public abstract class LibSvnClient {
- public LibSvnClient ()
+ abstract class LibSvnClient {
+ protected LibSvnClient ()
{
client_version ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,8 +32,8 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient0 : LibSvnClient {
- private const string svnclientlib = "libsvn_client-1.so.0";
+ sealed class LibSvnClient0 : LibSvnClient {
+ const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,8 +32,8 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient1 : LibSvnClient {
- private const string svnclientlib = "libsvn_client-1.so.1";
+ sealed class LibSvnClient1 : LibSvnClient {
+ const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
===================================================================
@@ -15,7 +15,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix
{
- public sealed class SvnClient : SubversionVersionControl
+ sealed class SvnClient : SubversionVersionControl
{
static LibApr apr;
static readonly Lazy<bool> isInstalled;
@@ -201,7 +201,7 @@ public override string GetDirectoryDotSvn (FilePath path)
}
}
- public sealed class UnixSvnBackend : SubversionBackend
+ sealed class UnixSvnBackend : SubversionBackend
{
protected static LibApr apr {
get {
@@ -1527,7 +1527,7 @@ void CollectorFunc (IntPtr baton, IntPtr path, IntPtr statusPtr)
}
}
- private class LogCollector
+ class LogCollector
{
static readonly DateTime Epoch = new DateTime (1970, 1, 1);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs
===================================================================
@@ -9,3 +9,5 @@
[assembly: AssemblyVersion ("2.6")]
[assembly: AssemblyCopyright ("LGPL")]
[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Tests")]
+[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Unix")]
+[assembly: InternalsVisibleTo ("VersionControl.Subversion.Win32")]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificateDialog : Gtk.Dialog
+ partial class ClientCertificateDialog : Gtk.Dialog
{
public ClientCertificateDialog (string realm, bool maySave)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificatePasswordDialog : Gtk.Dialog
+ partial class ClientCertificatePasswordDialog : Gtk.Dialog
{
public ClientCertificatePasswordDialog (string realm, bool maySave)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class SslServerTrustDialog : Gtk.Dialog
+ partial class SslServerTrustDialog : Gtk.Dialog
{
SslFailure failures;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class UserPasswordDialog : Gtk.Dialog
+ partial class UserPasswordDialog : Gtk.Dialog
{
public UserPasswordDialog (string user, string realm, bool mayRemember, bool showPassword)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificateDialog
+ internal partial class ClientCertificateDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificatePasswordDialog
+ internal partial class ClientCertificatePasswordDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class SslServerTrustDialog
+ internal partial class SslServerTrustDialog
{
private global::Gtk.HBox hbox1;
private global::Gtk.VBox vbox2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class UserPasswordDialog
+ internal partial class UserPasswordDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label4;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
===================================================================
@@ -14,6 +14,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Subversion</property>
<property name="Modal">True</property>
<property name="Resizable">False</property>
@@ -224,6 +225,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Repository Certified by an Unknown Authority</property>
<property name="Modal">True</property>
<property name="Buttons">2</property>
@@ -711,6 +713,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Client Certificate Required</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
@@ -784,6 +787,7 @@
<child>
<widget class="MonoDevelop.Components.FileEntry" id="fileentry">
<property name="MemberName" />
+ <property name="DisplayAsRelativePath">False</property>
</widget>
<packing>
<property name="Position">1</property>
@@ -872,6 +876,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Password for client certificate</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
Modified: main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs
===================================================================
@@ -4,6 +4,9 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+using System.Runtime.CompilerServices;
+
+
[assembly: AssemblyTitle ("SubversionAddinWindows")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
@@ -33,3 +36,5 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.0.0.0")]
[assembly: AssemblyFileVersion ("1.0.0.0")]
+
+[assembly: InternalsVisibleTo ("VersionControl.Subversion.Win32.Tests")]
Modified: main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
===================================================================
@@ -13,7 +13,7 @@
namespace SubversionAddinWindows
{
- public sealed class SvnSharpClient: SubversionVersionControl
+ sealed class SvnSharpClient: SubversionVersionControl
{
static bool errorShown;
static readonly bool installError;
@@ -75,7 +75,7 @@ public override string GetDirectoryDotSvn (FilePath path)
}
}
- public sealed class SvnSharpBackend: SubversionBackend
+ sealed class SvnSharpBackend: SubversionBackend
{
SvnClient client;
IProgressMonitor updateMonitor;
Commit: b7c0ef384e12117e52c5db1e69e8f3ba46d5609d
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-10-27 06:12:11 GMT
URL: https://github.com/mono/monodevelop/commit/b7c0ef384e12117e52c5db1e69e8f3ba46d5609d
Merge pull request #423 from mono/hideAPI
Hide Version Control internal API
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditRemoteDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitClient.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/NewStashDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/PushDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserGitConfigDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditBranchDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditRemoteDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitCommitDialogExtensionWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitConfigurationDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitOptionsPanelWidget.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.NewStashDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.StashManagerDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
M main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs
M main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class CredentialsDialog : Gtk.Dialog
+ partial class CredentialsDialog : Gtk.Dialog
{
readonly CredentialItem.YesNoType singleYesNoCred;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditBranchDialog : Dialog
+ partial class EditBranchDialog : Dialog
{
readonly ListStore comboStore;
readonly string currentTracking;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditRemoteDialog.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditRemoteDialog : Gtk.Dialog
+ partial class EditRemoteDialog : Gtk.Dialog
{
readonly RemoteSource remote;
readonly bool updating;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitClient.cs
===================================================================
@@ -26,7 +26,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public sealed class GitClient : GitVersionControl
+ sealed class GitClient : GitVersionControl
{
}
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCommitDialogExtension: CommitDialogExtension
+ sealed class GitCommitDialogExtension: CommitDialogExtension
{
GitCommitDialogExtensionWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtensionWidget.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Git
{
[System.ComponentModel.ToolboxItem(true)]
- public partial class GitCommitDialogExtensionWidget : Gtk.Bin
+ partial class GitCommitDialogExtensionWidget : Gtk.Bin
{
public GitCommitDialogExtensionWidget ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitConfigurationDialog : Dialog
+ partial class GitConfigurationDialog : Dialog
{
readonly GitRepository repo;
readonly ListStore storeBranches;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCredentials.cs
===================================================================
@@ -32,7 +32,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitCredentials: CredentialsProvider
+ sealed class GitCredentials: CredentialsProvider
{
bool HasReset {
get; set;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitNodeBuilderExtension.cs
===================================================================
@@ -33,7 +33,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitNodeBuilderExtension: NodeBuilderExtension
+ sealed class GitNodeBuilderExtension: NodeBuilderExtension
{
readonly Dictionary<FilePath,IWorkspaceObject> repos = new Dictionary<FilePath, IWorkspaceObject> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanel.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitOptionsPanel : OptionsPanel
+ sealed class GitOptionsPanel : OptionsPanel
{
GitOptionsPanelWidget widget;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitOptionsPanelWidget.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
[System.ComponentModel.ToolboxItem(true)]
- public partial class GitOptionsPanelWidget : Gtk.Bin
+ partial class GitOptionsPanelWidget : Gtk.Bin
{
public GitOptionsPanelWidget ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitSupportFeature.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class GitSupportFeature: ISolutionItemFeature
+ sealed class GitSupportFeature: ISolutionItemFeature
{
public FeatureSupportLevel GetSupportLevel (SolutionFolder parentFolder, SolutionItem entry)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitVersionControl.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public abstract class GitVersionControl : VersionControlSystem
+ abstract class GitVersionControl : VersionControlSystem
{
readonly Dictionary<FilePath,GitRepository> repositories = new Dictionary<FilePath,GitRepository> ();
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs
===================================================================
@@ -31,7 +31,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class MergeDialog : Dialog
+ partial class MergeDialog : Dialog
{
readonly TreeStore store;
readonly GitRepository repo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -39,7 +39,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public class MyersDiff : GitCommand<IList<DiffEntry>>
+ sealed class MyersDiff : GitCommand<IList<DiffEntry>>
{
AbstractTreeIterator oldTree;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/NewStashDialog.cs
===================================================================
@@ -26,7 +26,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class NewStashDialog : Gtk.Dialog
+ partial class NewStashDialog : Gtk.Dialog
{
public NewStashDialog ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/PushDialog.cs
===================================================================
@@ -29,7 +29,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class PushDialog : Gtk.Dialog
+ partial class PushDialog : Gtk.Dialog
{
readonly GitRepository repo;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs
===================================================================
@@ -30,7 +30,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class StashManagerDialog : Dialog
+ partial class StashManagerDialog : Dialog
{
readonly ListStore store;
readonly StashCollection stashes;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserGitConfigDialog.cs
===================================================================
@@ -27,7 +27,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserGitConfigDialog : Gtk.Dialog
+ partial class UserGitConfigDialog : Gtk.Dialog
{
public UserGitConfigDialog ()
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/UserInfoConflictDialog.cs
===================================================================
@@ -28,7 +28,7 @@
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserInfoConflictDialog : Gtk.Dialog
+ partial class UserInfoConflictDialog : Gtk.Dialog
{
public UserInfoConflictDialog (string mdInfo, string gitInfo)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.CredentialsDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class CredentialsDialog
+ internal partial class CredentialsDialog
{
private global::Gtk.VBox vbox;
private global::Gtk.Label labelTop;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditBranchDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditBranchDialog
+ internal partial class EditBranchDialog
{
private global::Gtk.VBox vbox5;
private global::Gtk.Table table4;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.EditRemoteDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class EditRemoteDialog
+ internal partial class EditRemoteDialog
{
private global::Gtk.VBox vbox7;
private global::Gtk.Table table3;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitCommitDialogExtensionWidget.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitCommitDialogExtensionWidget
+ internal partial class GitCommitDialogExtensionWidget
{
private global::Gtk.VBox vbox1;
private global::Gtk.CheckButton checkPush;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitConfigurationDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitConfigurationDialog
+ internal partial class GitConfigurationDialog
{
private global::Gtk.Notebook notebook1;
private global::Gtk.VBox vbox2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.GitOptionsPanelWidget.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class GitOptionsPanelWidget
+ internal partial class GitOptionsPanelWidget
{
private global::Gtk.VBox vbox2;
private global::Gtk.CheckButton checkStashBranch;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.MergeDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class MergeDialog
+ internal partial class MergeDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label labelHeader;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.NewStashDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class NewStashDialog
+ partial class NewStashDialog
{
private global::Gtk.HBox hbox3;
private global::Gtk.Label label3;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.PushDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class PushDialog
+ internal partial class PushDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.HBox hbox1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.StashManagerDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class StashManagerDialog
+ internal partial class StashManagerDialog
{
private global::Gtk.HBox hbox2;
private global::Gtk.ScrolledWindow GtkScrolledWindow;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserGitConfigDialog
+ internal partial class UserGitConfigDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.VBox vbox5;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserInfoConflictDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Git
{
- public partial class UserInfoConflictDialog
+ internal partial class UserInfoConflictDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic
===================================================================
@@ -13,6 +13,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.PushDialog" design-size="730 540">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Push to Repository</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -150,6 +151,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.UserInfoConflictDialog" design-size="529 249">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">User Information Conflict</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -431,6 +433,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.GitConfigurationDialog" design-size="602 410">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Git Repository Configuration</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">1</property>
@@ -849,6 +852,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.EditBranchDialog" design-size="400 200">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Branch Properties</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -1031,6 +1035,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.EditRemoteDialog" design-size="422 206">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Remote Source</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -1256,6 +1261,7 @@
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.MergeDialog" design-size="469 487">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
@@ -1383,6 +1389,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.CredentialsDialog" design-size="500 132">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Git Credentials</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">4</property>
@@ -1502,6 +1509,7 @@
<widget class="Gtk.Bin" id="MonoDevelop.VersionControl.Git.GitOptionsPanelWidget" design-size="391 300">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<child>
<widget class="Gtk.VBox" id="vbox2">
<property name="MemberName" />
@@ -1596,6 +1604,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.StashManagerDialog" design-size="575 367">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Stash Manager</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">1</property>
@@ -1749,6 +1758,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.NewStashDialog" design-size="412 114">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Stash</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
@@ -1842,6 +1852,7 @@
<widget class="Gtk.Bin" id="MonoDevelop.VersionControl.Git.GitCommitDialogExtensionWidget" design-size="319 114">
<property name="MemberName" />
<property name="Visible">False</property>
+ <property name="GeneratePublic">False</property>
<child>
<widget class="Gtk.VBox" id="vbox1">
<property name="MemberName" />
@@ -1988,6 +1999,7 @@
</widget>
<widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.UserGitConfigDialog" design-size="400 184">
<property name="MemberName" />
+ <property name="GeneratePublic">False</property>
<property name="WindowPosition">CenterOnParent</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/AssemblyInfo.cs
===================================================================
@@ -50,3 +50,4 @@
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
+[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Tests")]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
===================================================================
@@ -4,7 +4,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix
{
- public abstract class LibApr
+ abstract class LibApr
{
public static readonly int APR_OS_DEFAULT = 0xFFF;
public static readonly int APR_WRITE = 2;
@@ -31,7 +31,7 @@ public static LibApr GetLib (int ver)
}
}
- public LibApr ()
+ protected LibApr ()
{
initialize ();
}
@@ -64,9 +64,9 @@ public IntPtr pcalloc (IntPtr pool, object structure)
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
+ sealed class LibApr0: LibApr
{
- private const string aprlib = "libapr-0.so.0";
+ const string aprlib = "libapr-0.so.0";
public override int initialize() { return apr_initialize (); }
public override int pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
@@ -97,9 +97,9 @@ public class LibApr0: LibApr
[DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
}
- public class LibApr1: LibApr
+ sealed class LibApr1: LibApr
{
- private const string aprlib = "libapr-1.so.0";
+ const string aprlib = "libapr-1.so.0";
public override int initialize() { return apr_initialize (); }
public override int pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs
===================================================================
@@ -12,8 +12,8 @@
using size_t = System.Int32;
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public abstract class LibSvnClient {
- public LibSvnClient ()
+ abstract class LibSvnClient {
+ protected LibSvnClient ()
{
client_version ();
}
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient0.cs
===================================================================
@@ -32,8 +32,8 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient0 : LibSvnClient {
- private const string svnclientlib = "libsvn_client-1.so.0";
+ sealed class LibSvnClient0 : LibSvnClient {
+ const string svnclientlib = "libsvn_client-1.so.0";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient1.cs
===================================================================
@@ -32,8 +32,8 @@
namespace MonoDevelop.VersionControl.Subversion.Unix {
- public class LibSvnClient1 : LibSvnClient {
- private const string svnclientlib = "libsvn_client-1.so.1";
+ sealed class LibSvnClient1 : LibSvnClient {
+ const string svnclientlib = "libsvn_client-1.so.1";
public override IntPtr client_root_url_from_path (ref IntPtr url, string path_or_url, IntPtr ctx, IntPtr pool)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
===================================================================
@@ -15,7 +15,7 @@
namespace MonoDevelop.VersionControl.Subversion.Unix
{
- public sealed class SvnClient : SubversionVersionControl
+ sealed class SvnClient : SubversionVersionControl
{
static LibApr apr;
static readonly Lazy<bool> isInstalled;
@@ -201,7 +201,7 @@ public override string GetDirectoryDotSvn (FilePath path)
}
}
- public sealed class UnixSvnBackend : SubversionBackend
+ sealed class UnixSvnBackend : SubversionBackend
{
protected static LibApr apr {
get {
@@ -1527,7 +1527,7 @@ void CollectorFunc (IntPtr baton, IntPtr path, IntPtr statusPtr)
}
}
- private class LogCollector
+ class LogCollector
{
static readonly DateTime Epoch = new DateTime (1970, 1, 1);
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/AssemblyInfo.cs
===================================================================
@@ -9,3 +9,5 @@
[assembly: AssemblyVersion ("2.6")]
[assembly: AssemblyCopyright ("LGPL")]
[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Tests")]
+[assembly: InternalsVisibleTo ("MonoDevelop.VersionControl.Subversion.Unix")]
+[assembly: InternalsVisibleTo ("VersionControl.Subversion.Win32")]
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificateDialog : Gtk.Dialog
+ partial class ClientCertificateDialog : Gtk.Dialog
{
public ClientCertificateDialog (string realm, bool maySave)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificatePasswordDialog : Gtk.Dialog
+ partial class ClientCertificatePasswordDialog : Gtk.Dialog
{
public ClientCertificatePasswordDialog (string realm, bool maySave)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class SslServerTrustDialog : Gtk.Dialog
+ partial class SslServerTrustDialog : Gtk.Dialog
{
SslFailure failures;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
===================================================================
@@ -5,7 +5,7 @@
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class UserPasswordDialog : Gtk.Dialog
+ partial class UserPasswordDialog : Gtk.Dialog
{
public UserPasswordDialog (string user, string realm, bool mayRemember, bool showPassword)
{
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificateDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificateDialog
+ internal partial class ClientCertificateDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.ClientCertificatePasswordDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class ClientCertificatePasswordDialog
+ internal partial class ClientCertificatePasswordDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label1;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.SslServerTrustDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class SslServerTrustDialog
+ internal partial class SslServerTrustDialog
{
private global::Gtk.HBox hbox1;
private global::Gtk.VBox vbox2;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/MonoDevelop.VersionControl.Subversion.Gui.UserPasswordDialog.cs
===================================================================
@@ -2,7 +2,7 @@
// This file has been generated by the GUI designer. Do not modify.
namespace MonoDevelop.VersionControl.Subversion.Gui
{
- public partial class UserPasswordDialog
+ internal partial class UserPasswordDialog
{
private global::Gtk.VBox vbox2;
private global::Gtk.Label label4;
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/gui.stetic
===================================================================
@@ -14,6 +14,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Subversion</property>
<property name="Modal">True</property>
<property name="Resizable">False</property>
@@ -224,6 +225,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Repository Certified by an Unknown Authority</property>
<property name="Modal">True</property>
<property name="Buttons">2</property>
@@ -711,6 +713,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Client Certificate Required</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
@@ -784,6 +787,7 @@
<child>
<widget class="MonoDevelop.Components.FileEntry" id="fileentry">
<property name="MemberName" />
+ <property name="DisplayAsRelativePath">False</property>
</widget>
<packing>
<property name="Position">1</property>
@@ -872,6 +876,7 @@
<property name="MemberName" />
<property name="Visible">False</property>
<property name="Events">ButtonPressMask</property>
+ <property name="GeneratePublic">False</property>
<property name="Title" translatable="yes">Password for client certificate</property>
<property name="Buttons">2</property>
<property name="HelpButton">False</property>
Modified: main/src/addins/VersionControl/Subversion.Win32/Properties/AssemblyInfo.cs
===================================================================
@@ -4,6 +4,9 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
+using System.Runtime.CompilerServices;
+
+
[assembly: AssemblyTitle ("SubversionAddinWindows")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
@@ -33,3 +36,5 @@
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion ("1.0.0.0")]
[assembly: AssemblyFileVersion ("1.0.0.0")]
+
+[assembly: InternalsVisibleTo ("VersionControl.Subversion.Win32.Tests")]
Modified: main/src/addins/VersionControl/Subversion.Win32/SvnSharpClient.cs
===================================================================
@@ -13,7 +13,7 @@
namespace SubversionAddinWindows
{
- public sealed class SvnSharpClient: SubversionVersionControl
+ sealed class SvnSharpClient: SubversionVersionControl
{
static bool errorShown;
static readonly bool installError;
@@ -75,7 +75,7 @@ public override string GetDirectoryDotSvn (FilePath path)
}
}
- public sealed class SvnSharpBackend: SubversionBackend
+ sealed class SvnSharpBackend: SubversionBackend
{
SvnClient client;
IProgressMonitor updateMonitor;
Commit: 67c9f0db9a34286b980e3d8a1643abe180222bc4
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-27 06:38:58 GMT
URL: https://github.com/mono/monodevelop/commit/67c9f0db9a34286b980e3d8a1643abe180222bc4
[Git] Fix failed conflicts for previous commit.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MyersDiff.cs
===================================================================
@@ -171,7 +171,7 @@ public override IList<DiffEntry> Call()
/// <param name="cached">whether to view the changes you staged for the next commit</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetCached(bool cached)
+ public MyersDiff SetCached(bool cached)
{
this.cached = cached;
return this;
@@ -179,7 +179,7 @@ public virtual MyersDiff SetCached(bool cached)
/// <param name="pathFilter">parameter, used to limit the diff to the named path</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
+ public MyersDiff SetPathFilter(TreeFilter pathFilter)
{
this.pathFilter = pathFilter;
return this;
@@ -187,7 +187,7 @@ public virtual MyersDiff SetPathFilter(TreeFilter pathFilter)
/// <param name="oldTree">the previous state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
+ public MyersDiff SetOldTree(AbstractTreeIterator oldTree)
{
this.oldTree = oldTree;
return this;
@@ -195,7 +195,7 @@ public virtual MyersDiff SetOldTree(AbstractTreeIterator oldTree)
/// <param name="newTree">the updated state</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
+ public MyersDiff SetNewTree(AbstractTreeIterator newTree)
{
this.newTree = newTree;
return this;
@@ -204,7 +204,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="showNameAndStatusOnly">whether to return only names and status of changed files
/// </param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
+ public MyersDiff SetShowNameAndStatusOnly(bool showNameAndStatusOnly
)
{
this.showNameAndStatusOnly = showNameAndStatusOnly;
@@ -213,7 +213,7 @@ public virtual MyersDiff SetNewTree(AbstractTreeIterator newTree)
/// <param name="out">the stream to write line data</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetOutputStream(OutputStream @out)
+ public MyersDiff SetOutputStream(OutputStream @out)
{
this.@out = @out;
return this;
@@ -223,7 +223,7 @@ public virtual MyersDiff SetOutputStream(OutputStream @out)
/// <remarks>Set number of context lines instead of the usual three.</remarks>
/// <param name="contextLines">the number of context lines</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetContextLines(int contextLines)
+ public MyersDiff SetContextLines(int contextLines)
{
this.contextLines = contextLines;
return this;
@@ -233,7 +233,7 @@ public virtual MyersDiff SetContextLines(int contextLines)
/// <remarks>Set the given source prefix instead of "a/".</remarks>
/// <param name="sourcePrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
+ public MyersDiff SetSourcePrefix(string sourcePrefix)
{
this.sourcePrefix = sourcePrefix;
return this;
@@ -243,7 +243,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <remarks>Set the given destination prefix instead of "b/".</remarks>
/// <param name="destinationPrefix">the prefix</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetDestinationPrefix(string destinationPrefix
+ public MyersDiff SetDestinationPrefix(string destinationPrefix
)
{
this.destinationPrefix = destinationPrefix;
@@ -258,7 +258,7 @@ public virtual MyersDiff SetSourcePrefix(string sourcePrefix)
/// <seealso cref="NGit.NullProgressMonitor">NGit.NullProgressMonitor</seealso>
/// <param name="monitor">a progress monitor</param>
/// <returns>this instance</returns>
- public virtual MyersDiff SetProgressMonitor(ProgressMonitor monitor)
+ public MyersDiff SetProgressMonitor(ProgressMonitor monitor)
{
this.monitor = monitor;
return this;
Commit: c515027055e4d7ea15c1ac27ea5f0437a16f587d
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 06:47:32 GMT
URL: https://github.com/mono/monodevelop/commit/c515027055e4d7ea15c1ac27ea5f0437a16f587d
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]=d0a8f0e529df0e446c4be55bc856353f86e9116b
+DEP_NEEDED_VERSION[0]=a62b1bcc267b93d8f720551c5c27310ef04e31ad
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 754db65be3925b86e7fd8afd6b22365dcdac2d6c
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-27 09:52:04 GMT
URL: https://github.com/mono/monodevelop/commit/754db65be3925b86e7fd8afd6b22365dcdac2d6c
[TextEditorTests] Report tests on windows as inconclusive.
Changed paths:
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/HtmlWriterTests.cs
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/RtfWriterTests.cs
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/HtmlWriterTests.cs
===================================================================
@@ -37,7 +37,7 @@ public class HtmlWriterTests : TextEditorTestBase
public void TestSimpleCSharpHtml ()
{
if (Platform.IsWindows)
- return;
+ Assert.Inconclusive ();
var data = Create ("class Foo {}");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
data.Document.SyntaxMode = SyntaxModeService.GetSyntaxMode (data.Document, "text/x-csharp");
@@ -60,7 +60,7 @@ public void TestSimpleCSharpHtml ()
public void TestXml ()
{
if (Platform.IsWindows)
- return;
+ Assert.Inconclusive ();
var data = Create (
@"<foo
attr1 = ""1""
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/RtfWriterTests.cs
===================================================================
@@ -37,7 +37,7 @@ public class RtfWriterTests : TextEditorTestBase
public void TestSimpleCSharpRtf ()
{
if (Platform.IsWindows)
- return;
+ Assert.Inconclusive ();
var data = Create ("class Foo {}");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
data.Document.SyntaxMode = SyntaxModeService.GetSyntaxMode (data.Document, "text/x-csharp");
@@ -61,7 +61,7 @@ public void TestSimpleCSharpRtf ()
public void TestBug5628 ()
{
if (Platform.IsWindows)
- return;
+ Assert.Inconclusive ();
var data = Create ("class Foo {}");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
string generatedRtf = RtfWriter.GenerateRtf (data);
@@ -84,7 +84,7 @@ public void TestBug5628 ()
public void TestBug7386 ()
{
if (Platform.IsWindows)
- return;
+ Assert.Inconclusive ();
var data = Create ("✔");
data.ColorStyle = SyntaxModeService.GetColorStyle ("TangoLight");
string generatedRtf = RtfWriter.GenerateRtf (data);
@@ -105,7 +105,7 @@ public void TestBug7386 ()
public void TestXml ()
{
if (Platform.IsWindows)
- return;
+ Assert.Inconclusive ();
var data = Create (
@"<foo
attr1 = ""1""
Commit: 8f76ad216fcd8455a86d192dd208784ab6e3bb63
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 14:46:26 GMT
URL: https://github.com/mono/monodevelop/commit/8f76ad216fcd8455a86d192dd208784ab6e3bb63
use the right hash for 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]=f2e42f74be68fcf866c390c6177458747f79a3b8
+DEP_NEEDED_VERSION[0]=0cd6bad21aa99f5a6cb361f0eca877382bff961e
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 5eb6cf801a71fd1a9eaffdc5bf4a2f0539057970
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 15:13:59 GMT
URL: https://github.com/mono/monodevelop/commit/5eb6cf801a71fd1a9eaffdc5bf4a2f0539057970
Bump gui-unit to allow our tests to compile again
We need it signed.
Changed paths:
M main/external/guiunit
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 55f1f48ab46fe8728beb0bb58118689d26a6452c
+Subproject commit 3de2256e39187d0975dae8c948c0e981e0cdd0ce
Commit: a81050a95d8bc2a88a31fe466c3ed97fa6faa93c
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 15:15:09 GMT
URL: https://github.com/mono/monodevelop/commit/a81050a95d8bc2a88a31fe466c3ed97fa6faa93c
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]=a62b1bcc267b93d8f720551c5c27310ef04e31ad
+DEP_NEEDED_VERSION[0]=f2f203805d262602b834a0aa2e9c6a231358ad8a
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 3bd6b83499d8fece9c002a72f9e5046d48a4be88
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 15:17:17 GMT
URL: https://github.com/mono/monodevelop/commit/3bd6b83499d8fece9c002a72f9e5046d48a4be88
Bump md-addins and gui-unit so our tests compile
Changed paths:
M main/external/guiunit
M version-checks
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 05e006597ceb366b9d84c95b88647dc275ddd32e
+Subproject commit 3de2256e39187d0975dae8c948c0e981e0cdd0ce
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]=0cd6bad21aa99f5a6cb361f0eca877382bff961e
+DEP_NEEDED_VERSION[0]=8c07050901e98f02672f09ee9731754216cceca0
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 82af851be5765e2409dba29cd10626ae53be2636
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 21:59:02 GMT
URL: https://github.com/mono/monodevelop/commit/82af851be5765e2409dba29cd10626ae53be2636
Improve docs
Changed paths:
M README
Modified: README
===================================================================
@@ -82,7 +82,9 @@ Special Environment Variables
-----------------------------
BUILD_REVISION
- If this environment variable exists we assume we are compiling inside wrench
+ If this environment variable exists we assume we are compiling inside wrench.
+ We use this to enable raygun only for 'release' builds and not for normal
+ developer builds compiled on a dev machine with 'make && make run'.
References
Commit: 87a3fd3692e2f3ecf850120a7dddc9bb16664f3c
Author: Alan McGovern <[email protected]> (alanmcgovern)
Date: 2013-10-27 22:40:23 GMT
URL: https://github.com/mono/monodevelop/commit/87a3fd3692e2f3ecf850120a7dddc9bb16664f3c
[tests] Bump so we run tests in the right test runner
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]=f2f203805d262602b834a0aa2e9c6a231358ad8a
+DEP_NEEDED_VERSION[0]=a650ac589a1238944380df04f9c84ca6d39cd1b6
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 069496b620eca4fc39788b253ad90622affa3ac1
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-28 06:08:29 GMT
URL: https://github.com/mono/monodevelop/commit/069496b620eca4fc39788b253ad90622affa3ac1
Change guiunit signing key to one that builds
BXC15736 - Cannot build on .NET 4.5.1
Changed paths:
M main/external/guiunit
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 3de2256e39187d0975dae8c948c0e981e0cdd0ce
+Subproject commit 8c672f30b6d90e878ebafeb2e518dec35e92c56a
Commit: 869fd73858a02d783151ae753ae8f8db7c5414a9
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-28 06:25:38 GMT
URL: https://github.com/mono/monodevelop/commit/869fd73858a02d783151ae753ae8f8db7c5414a9
[Docs] Update README to match configure.
Changed paths:
M README
M main/configure.in
Modified: README
===================================================================
@@ -73,7 +73,7 @@ Packaging for OSX
Dependencies
------------
- Mono >= 2.10
+ Mono >= 3.0.4
Gtk# >= 2.12.8
monodoc >= 1.0
mono-addins >= 0.6
Modified: main/configure.in
===================================================================
@@ -97,7 +97,6 @@ if test "x$MSGMERGE" = "xno"; then
AC_MSG_ERROR([You need to install msgmerge from intltool])
fi
-MONO_REQUIRED_VERSION=2.8
PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MONO,mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
if test "x$has_mono" = "xfalse"; then
Commit: 6f9d589c24d5f8cb9a5110cd8016b7628e148210
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-28 10:44:46 GMT
URL: https://github.com/mono/monodevelop/commit/6f9d589c24d5f8cb9a5110cd8016b7628e148210
[Projects Tests] Change mdb to pdb compatibility for projects using msbuild.
Changed paths:
M main/tests/UnitTests/MonoDevelop.Projects/LocalCopyTests.cs
Modified: main/tests/UnitTests/MonoDevelop.Projects/LocalCopyTests.cs
===================================================================
@@ -50,16 +50,19 @@ public void CheckLocalCopy ()
AssertCleanBuild (sol, "Debug");
AssertCleanBuild (sol, "Release");
+
+ string dllDebug = Platform.IsWindows ? ".pdb" : ".dll.mdb";
+ string exeDebug = Platform.IsWindows ? ".pdb" : ".exe.mdb";
AssertOutputFiles (sol, "VSLocalCopyTest", "Debug", new string[] {
"ClassLibrary1.dll",
- "ClassLibrary1.dll.mdb",
+ "ClassLibrary1" + dllDebug,
"ClassLibrary2.dll",
- "ClassLibrary2.dll.mdb",
+ "ClassLibrary2" + dllDebug,
"ClassLibrary4.dll",
- "ClassLibrary4.dll.mdb",
+ "ClassLibrary4" + dllDebug,
"VSLocalCopyTest.exe",
- "VSLocalCopyTest.exe.mdb",
+ "VSLocalCopyTest" + exeDebug,
"TextFile1.txt",
"TextFile2.txt",
"app.config",
@@ -87,9 +90,9 @@ public void CheckLocalCopy ()
AssertOutputFiles (sol, "ClassLibrary1", "Debug", new string[] {
"ClassLibrary1.dll",
- "ClassLibrary1.dll.mdb",
+ "ClassLibrary1" + dllDebug,
"ClassLibrary2.dll",
- "ClassLibrary2.dll.mdb",
+ "ClassLibrary2" + dllDebug,
"TextFile1.txt",
"TextFile2.txt",
"foo/bar.txt",
@@ -105,7 +108,7 @@ public void CheckLocalCopy ()
AssertOutputFiles (sol, "ClassLibrary2", "Debug", new string[] {
"ClassLibrary2.dll",
- "ClassLibrary2.dll.mdb",
+ "ClassLibrary2" + dllDebug,
"TextFile2.txt"
});
@@ -116,7 +119,7 @@ public void CheckLocalCopy ()
AssertOutputFiles (sol, "ClassLibrary3", "Debug", new string[] {
"ClassLibrary3.dll",
- "ClassLibrary3.dll.mdb"
+ "ClassLibrary3" + dllDebug
});
AssertOutputFiles (sol, "ClassLibrary3", "Release", new string[] {
@@ -125,7 +128,7 @@ public void CheckLocalCopy ()
AssertOutputFiles (sol, "ClassLibrary4", "Debug", new string[] {
"ClassLibrary4.dll",
- "ClassLibrary4.dll.mdb"
+ "ClassLibrary4" + dllDebug
});
AssertOutputFiles (sol, "ClassLibrary4", "Release", new string[] {
@@ -134,7 +137,7 @@ public void CheckLocalCopy ()
AssertOutputFiles (sol, "ClassLibrary5", "Debug", new string[] {
"ClassLibrary5.dll",
- "ClassLibrary5.dll.mdb",
+ "ClassLibrary5" + dllDebug,
});
AssertOutputFiles (sol, "ClassLibrary5", "Release", new string[] {
Commit: 6006ef2c5e37745b3d1a1d4739ed95ac234ef7b8
Author: Michael Hutchinson <[email protected]> (mhutch)
Committer: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-28 18:14:29 GMT
URL: https://github.com/mono/monodevelop/commit/6006ef2c5e37745b3d1a1d4739ed95ac234ef7b8
Change guiunit signing key to one that builds
BXC15736 - Cannot build on .NET 4.5.1
Changed paths:
M main/external/guiunit
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 3de2256e39187d0975dae8c948c0e981e0cdd0ce
+Subproject commit 8c672f30b6d90e878ebafeb2e518dec35e92c56a
Commit: b37834a4895190ce2e55408c7d9d08062e96ea34
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-28 18:57:48 GMT
URL: https://github.com/mono/monodevelop/commit/b37834a4895190ce2e55408c7d9d08062e96ea34
Bump md-addins for guiunit build 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]=a650ac589a1238944380df04f9c84ca6d39cd1b6
+DEP_NEEDED_VERSION[0]=2581d4e32ca9f5aca93e6d245de9109b3447d613
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 38aa58fb63eefa9a6ab156ad374f7c6bd5b27011
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-28 18:59:40 GMT
URL: https://github.com/mono/monodevelop/commit/38aa58fb63eefa9a6ab156ad374f7c6bd5b27011
Bump md-addins for guiunit build 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]=8c07050901e98f02672f09ee9731754216cceca0
+DEP_NEEDED_VERSION[0]=d5206cefd03f6f9c3c2c26eb534d24934c8c185a
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: ed9f06e8a2b7ab9b1d2bcfba5a121bf63a68fb3c
Author: Xamarin Release Manager <[email protected]> (xamarin-release-manager)
Date: 2013-10-28 19:27:10 GMT
URL: https://github.com/mono/monodevelop/commit/ed9f06e8a2b7ab9b1d2bcfba5a121bf63a68fb3c
Updated package version to 4.1.13
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.7
+VERSION=4.1.13
PACKAGE=aspnetedit
prefix=/usr/local
config=DEBUG
Modified: extras/BooBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/bin/bash
-VERSION=4.1.7
+VERSION=4.1.13
PACKAGE=monodevelop-boo
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.1.7 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.1.13 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.7
+VERSION=4.1.13
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.7"
+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"
usage ()
Modified: extras/JavaBinding/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
PACKAGE=monodevelop-java
prefix=/usr/local
config=DEBUG
Modified: extras/MonoDevelop.AddinAuthoring/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
PACKAGE=monodevelop_addinauthoring
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.7 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
+common_packages=" monodevelop;4.1.13 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
usage ()
Modified: extras/MonoDevelop.Database/configure.in
===================================================================
@@ -1,9 +1,9 @@
-AC_INIT([monodevelop-database], 4.1.7, [[email protected]])
+AC_INIT([monodevelop-database], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, dmcs)
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.4
-MONODEVELOP_REQUIRED_VERSION=4.1.7
+MONODEVELOP_REQUIRED_VERSION=4.1.13
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.7
+VERSION=4.1.13
PACKAGE=monodevelop-debugger-gdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.7"
+common_packages=" monodevelop;4.1.13"
usage ()
Modified: extras/MonoDevelop.Debugger.Mdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.1.13 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.7 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
usage ()
{
Modified: extras/MonoDevelop.Profiling/configure.in
===================================================================
@@ -1,9 +1,9 @@
-AC_INIT([monodevelop-profiling], 4.1.7, [[email protected]])
+AC_INIT([monodevelop-profiling], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, dmcs)
@@ -42,7 +42,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
-MONODEVELOP_REQUIRED_VERSION=4.1.7
+MONODEVELOP_REQUIRED_VERSION=4.1.13
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.7
+VERSION=4.1.13
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.7 monodevelop-core-addins;2.7"
+common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
usage ()
Modified: extras/ValaBinding/configure.in
===================================================================
@@ -1,9 +1,9 @@
-AC_INIT([monodevelop-vala], 4.1.7, [[email protected]])
+AC_INIT([monodevelop-vala], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE(1.9 tar-ustar)
AM_MAINTAINER_MODE
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, dmcs)
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.1.7
+MONODEVELOP_REQUIRED_VERSION=4.1.13
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.7
+VERSION=4.1.13
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.7 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.1.13 webkit-sharp-1.0;0.2"
usage ()
Modified: main/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 4.1.7, [[email protected]])
+AC_INIT([monodevelop], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.10 tar-ustar])
AM_MAINTAINER_MODE
@@ -6,13 +6,13 @@ AM_MAINTAINER_MODE
#capture aclocal flags for autoreconf
AC_SUBST(ACLOCAL_FLAGS)
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
# This is parsed in BuildVariables.cs. Keep the format consistent to avoid breaking
# 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.7"
+PACKAGE_VERSION_LABEL="4.1.13"
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.7";
- public const string VersionLabel = "4.1.7";
+ public const string Version = "4.1.13";
+ public const string VersionLabel = "4.1.13";
public const string CompatVersion = "4.0";
}
}
Commit: d07d532dfe121566d1a5f3247eb4336251a5db0a
Author: Xamarin Release Manager <[email protected]> (xamarin-release-manager)
Date: 2013-10-28 19:27:31 GMT
URL: https://github.com/mono/monodevelop/commit/d07d532dfe121566d1a5f3247eb4336251a5db0a
Updated add-ins version to 4.1.13
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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "AspNetEdit.dll"/>
@@ -14,11 +14,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Deployment" version="4.1.7" />
- <Addin id="AspNet" version="4.1.7" />
- <Addin id="DesignerSupport" version="4.1.7" />
+ <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" />
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "BooBinding.dll"/>
@@ -16,8 +16,8 @@
<Localizer type="Gettext" catalog="monodevelop-boo"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
<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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Ide" version = "4.1.7"/>
+ <Addin id = "Ide" version = "4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.SourceEditor.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
<Localizer type="Gettext" catalog="monodevelop-java"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "LuaBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="VersionControl" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<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.7">
+ version = "4.1.13">
<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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Query" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Components.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Query" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Designer.dll"/>
@@ -15,9 +15,9 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Database.Sql" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Query.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
+ <Addin id="MonoDevelop.Core" version="4.1.13"/>
+ <Addin id="MonoDevelop.Ide" version="4.1.13"/>
+ <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger.Mdb" version="4.1.7"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
+ <Addin id="MonoDevelop.Core" version="4.1.13"/>
+ <Addin id="MonoDevelop.Ide" version="4.1.13"/>
+ <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import file = "Templates/MeeGoGtkProject.xpt.xml"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Debugger" version="4.1.7"/>
- <Addin id="Debugger.Soft" version="4.1.7"/>
- <Addin id="GtkCore" version="4.1.7"/>
- <Addin id="CSharpBinding" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapBuddy.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Profiling" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Profiling" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapShot.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Profiling" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Profiling" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Profiling.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "NemerleBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import file = "OpenOfficeSpreadsheetSample.xpt.xml"/>
@@ -18,8 +18,8 @@
</Runtime>
<Dependencies>
- <Addin id = "Ide" version="4.1.7"/>
- <Addin id = "CSharpBinding" version = "4.1.7" />
+ <Addin id = "Ide" version="4.1.13"/>
+ <Addin id = "CSharpBinding" version = "4.1.13" />
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "PyBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id = "Core" version = "4.1.7"/>
- <Addin id = "Ide" version = "4.1.7"/>
- <Addin id = "SourceEditor2" version = "4.1.7"/>
+ <Addin id = "Core" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "SourceEditor2" version = "4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Core" version = "4.1.7"/>
- <Addin id = "Ide" version = "4.1.7"/>
- <Addin id = "Deployment" version = "4.1.7"/>
- <Addin id = "Deployment.Linux" version = "4.1.7"/>
- <Addin id = "Autotools" version = "4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Ide" version = "4.1.7"/>
+ <Addin id = "Ide" version = "4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Core" version = "4.1.7"/>
- <Addin id = "Ide" version = "4.1.7"/>
- <Addin id = "Deployment" version = "4.1.7"/>
- <Addin id = "Deployment.Linux" version = "4.1.7"/>
- <Addin id = "SourceEditor2" version = "4.1.7" />
- <Addin id = "DesignerSupport" version = "4.1.7" />
- <Addin id = "Refactoring" version = "4.1.7" />
+ <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" />
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -241,7 +241,7 @@
</Runtime>
<Dependencies>
- <Addin id = "MonoDevelop.Autotools" version = "4.1.7"/>
+ <Addin id = "MonoDevelop.Autotools" version = "4.1.13"/>
</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.7"/>
+ <Addin id="Autotools" version="4.1.13"/>
</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.7"/>
+ <Addin id="AspNet" version="4.1.13"/>
</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.7"
+ version = "4.1.13"
flags = "Hidden"
compatVersion = "4.0">
@@ -15,9 +15,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Deployment" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Deployment" version="4.1.13"/>
</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.7"
+ version = "4.1.13"
flags = "Hidden"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="DesignerSupport" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "MonoDevelop.CodeMetrics.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.Moonlight" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
+ <Addin id="MonoDevelop.Core" version="4.1.13"/>
+ <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="libstetic.dll"/>
@@ -17,9 +17,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="DesignerSupport" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="libstetic2.dll"/>
@@ -17,11 +17,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
- <Addin id="XmlEditor" version="4.1.7"/>
- <Addin id="Refactoring" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
- <Addin id="Deployment" version="4.1.7"/>
- <Addin id="AspNet" version="4.1.7" />
+ <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" />
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.XmlEditor.dll" />
@@ -21,10 +21,10 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDeveloperExtensions.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/FileFormats">
@@ -51,7 +51,7 @@
<Import assembly="MonoDeveloperExtensions_nunit.dll"/>
</Runtime>
<Dependencies>
- <Addin id="NUnit" version="4.1.7"/>
+ <Addin id="NUnit" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.NUnit.dll" />
@@ -17,8 +17,8 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="Mono.TextTemplating.dll" />
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="SourceEditor2" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.VersionControl.Git.dll"/>
@@ -14,9 +14,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="VersionControl" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
- <Addin id="VersionControl.Subversion" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="VersionControl" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import file="comment.png" />
@@ -24,9 +24,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="SourceEditor2" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
- <Addin id="VersionControl.Subversion" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="WindowsPlatform.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7"
+ version = "4.1.13"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/Applications">
Commit: 2349fbd0d7199ec23213f5c08967c68ee02c36b4
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-29 06:06:55 GMT
URL: https://github.com/mono/monodevelop/commit/2349fbd0d7199ec23213f5c08967c68ee02c36b4
[TextEditor] Fixed potential problem in height calculation.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor/HeightTree.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/HeightTree.cs
===================================================================
@@ -290,7 +290,7 @@ public void Unfold (FoldMarker marker, int lineNumber, int count)
public double LineNumberToY (int lineNumber)
{
int curLine = System.Math.Min (tree.Root.totalCount, lineNumber);
- if (curLine < 0)
+ if (curLine <= 0)
return 0;
lock (tree) {
var node = GetSingleLineNode (curLine);
Commit: 46af0b4759116709dc6ecd78998a055c63f64a1e
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-29 06:06:56 GMT
URL: https://github.com/mono/monodevelop/commit/46af0b4759116709dc6ecd78998a055c63f64a1e
Fixed 'Bug 15476 - Cursor is getting stuck when deleting last empty
line with indents '.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/DeleteActions.cs
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Actions/DeleteActions.cs
===================================================================
@@ -212,6 +212,7 @@ public static void Backspace (TextEditorData data, Action<TextEditorData> remove
} else if (data.Caret.Offset == line.Offset) {
DocumentLine lineAbove = data.Document.GetLine (data.Caret.Line - 1);
if (lineAbove.Length == 0 && data.HasIndentationTracker && data.Options.IndentStyle == IndentStyle.Virtual) {
+ data.Caret.Location = new DocumentLocation (data.Caret.Line - 1, data.IndentationTracker.GetVirtualIndentationColumn (data.Caret.Line - 1, 1));
data.Replace (lineAbove.EndOffsetIncludingDelimiter - lineAbove.DelimiterLength, lineAbove.DelimiterLength, data.IndentationTracker.GetIndentationString (data.Caret.Line - 1, 1));
} else {
data.Remove (lineAbove.EndOffsetIncludingDelimiter - lineAbove.DelimiterLength, lineAbove.DelimiterLength);
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/VirtualIndentModeTests.cs
===================================================================
@@ -442,6 +442,28 @@ public void TestEmptyLineSelectionBehaviorMoveDown ()
Assert.AreEqual (new DocumentLocation (2, 3), data.MainSelection.Anchor);
}
+
+ /// <summary>
+ /// Bug 15476 - Cursor is getting stuck when deleting last empty line with indents
+ /// </summary>
+ [Test]
+ public void TestBug15476 ()
+ {
+ var data = CreateData ("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n\t\t\r\n\r\n");
+ data.Options.DefaultEolMarker = "\r\n";
+ data.IndentationTracker = new DefaultIndentationTracker (data.Document);
+ data.Caret.Location = new DocumentLocation (4, 3);
+
+ DeleteActions.Backspace (data);
+ Assert.AreEqual (new DocumentLocation (4, 2), data.Caret.Location);
+ DeleteActions.Backspace (data);
+ Assert.AreEqual (new DocumentLocation (4, 1), data.Caret.Location);
+
+ DeleteActions.Backspace (data);
+ Assert.AreEqual (new DocumentLocation (3, 3), data.Caret.Location);
+
+ }
+
}
}
Commit: 5946b44084ec80cd55c4ea470e099b9cd70d78f8
Author: lluis <[email protected]> (slluis)
Date: 2013-10-29 17:44:20 GMT
URL: https://github.com/mono/monodevelop/commit/5946b44084ec80cd55c4ea470e099b9cd70d78f8
Updated references to xwt, md-addins
Changed paths:
M main/external/xwt
M version-checks
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 6f77443b6b17bddb3b812499ccb5a660b0015466
+Subproject commit 1392fb54b08abe4e07b9cc14c4c93fb7e8ef777c
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]=d5206cefd03f6f9c3c2c26eb534d24934c8c185a
+DEP_NEEDED_VERSION[0]=cdffaa3747c3cc649e9e3d066e5b110c78b9d7a9
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 4edd3705b83261d3519eb556d3780494f6cccae9
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-29 20:25:59 GMT
URL: https://github.com/mono/monodevelop/commit/4edd3705b83261d3519eb556d3780494f6cccae9
bumped version-checks for md-addins 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]=cdffaa3747c3cc649e9e3d066e5b110c78b9d7a9
+DEP_NEEDED_VERSION[0]=ab4334758efaa786406e8b4a6763ab27b64675a5
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 474bbf1024357e3b3149e62c23f30d2ef655a4fd
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-29 21:11:34 GMT
URL: https://github.com/mono/monodevelop/commit/474bbf1024357e3b3149e62c23f30d2ef655a4fd
bumped version-checks for md-addins 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]=ab4334758efaa786406e8b4a6763ab27b64675a5
+DEP_NEEDED_VERSION[0]=e33359865d970df164c1cb7a0f6d89f938c79d34
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: c3405486ee3c7ea91f78664dbede08dfde81bd5a
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-29 21:20:06 GMT
URL: https://github.com/mono/monodevelop/commit/c3405486ee3c7ea91f78664dbede08dfde81bd5a
[README] Replace old readme with markdown.
Added paths:
A README.md
Removed paths:
D README
Removed: README
===================================================================
@@ -1,116 +0,0 @@
-
-MonoDevelop is a full-featured integrated development environment (IDE) for mono
-and Gtk#. See http://www.monodevelop.com for more info.
-
-Directory organization
-----------------------
-
- There are two main directories:
-
- * main: The core MonoDevelop assemblies and add-ins (all in a single
- tarball/package).
- * extras: Additional add-ins (each add-in has its own
- tarball/package).
-
-Compiling
----------
-
- If you are building from Git, make sure that you initialize the submodules
- that are part of MonoDevelop, to do this execute:
-
- git submodule update --init --recursive
-
- To compile execute:
-
- ./configure
- make
-
- There are two variables you can set when running 'configure':
-
- --prefix=/path/to/prefix: To set the install prefix.
-
- you can use --prefix=`pkg-config --variable=prefix mono` to get MD
- installed with the rest of mono/gtk-sharp/etc.
-
- --profile=profile-name: To choose one build profile.
-
- There are some predefined profiles:
-
- * stable: builds the MonoDevelop core and some stable extra add-ins.
- * core: builds the MonoDevelop core only.
- * all: builds everything
-
- You can create your own profiles if you need to. To create a profile you
- only have to add a file to the profiles directory containing a list
- of the directories to build.
-
- You can run MonoDevelop from the build directory without having to
- install it by executing:
-
- make run
-
-Installing
-----------
-
- Installing is currently optional.
- (Use make run to use MonoDevelop without installing.)
-
- make install
-
- (It's possible that you need to install for your locale to be
- correctly set.)
-
-Packaging for OSX
------------------
-
- To package MonoDevelop for OSX in a convenient MonoDevelop.app
- file, just do this after MonoDevelop has finished building (with
- make):
-
- cd main/build/MacOSX
- make MonoDevelop.app
-
-Dependencies
-------------
-
- Mono >= 3.0.4
- Gtk# >= 2.12.8
- monodoc >= 1.0
- mono-addins >= 0.6
-
-Special Environment Variables
------------------------------
-
-BUILD_REVISION
- If this environment variable exists we assume we are compiling inside wrench.
- We use this to enable raygun only for 'release' builds and not for normal
- developer builds compiled on a dev machine with 'make && make run'.
-
-
-References
-----------
-
- MonoDevelop web site
- http://www.monodevelop.com
-
- Gnome Human Interface Guidelines (HIG)
- http://developer.gnome.org/projects/gup/hig/1.0/
-
- freedesktop.org standards
- http://freedesktop.org/Standards/
-
- Integrating with GNOME (a little out of date)
- http://developers.sun.com/solaris/articles/integrating_gnome.html
-
- Bugzilla
- http://bugzilla.mozilla.org/bugwritinghelp.html
- http://bugzilla.mozilla.org/page.cgi?id=etiquette.html
-
-Discussion, Bugs, Patches
--------------------------
-
- [email protected] (questions and discussion)
- [email protected] (track commits to MonoDevelop)
- [email protected] (track MonoDevelop bugzilla component)
- http://bugzilla.xamarin.com (submit bugs and patches here)
-
Added: README.md
===================================================================
@@ -0,0 +1,123 @@
+**MonoDevelop** is a full-featured integrated development environment (IDE) for mono
+using Gtk#.
+
+See http://www.monodevelop.com for more info.
+
+Directory organization
+----------------------
+
+There are two main directories:
+
+ * main: The core MonoDevelop assemblies and add-ins (all in a single
+ tarball/package).
+ * extras: Additional add-ins (each add-in has its own
+ tarball/package).
+
+Compiling
+---------
+
+If you are building from Git, make sure that you initialize the submodules
+that are part of MonoDevelop, to do this execute:
+
+`git submodule update --init --recursive`
+
+To compile execute:
+
+`./configure ; make`
+
+There are two variables you can set when running 'configure':
+
+`--prefix=/path/to/prefix: To set the install prefix.`
+
+You can use `--prefix="pkg-config --variable=prefix mono"` to get MD
+installed with the rest of mono/gtk-sharp/etc.
+
+`--profile=profile-name: To choose one build profile.`
+
+There are some predefined profiles:
+
+ * stable: builds the MonoDevelop core and some stable extra add-ins.
+ * core: builds the MonoDevelop core only.
+ * all: builds everything
+
+You can create your own profiles if you need to
+
+To create a profile you only have to add a file to the profiles directory
+containing a list of the directories to build.
+
+You can run MonoDevelop from the build directory without having to
+install it by executing:
+
+`make run`
+
+Installing *(Optional)*
+----------
+
+`make install`
+
+(It's possible that you need to install for your locale to be
+correctly set.)
+
+Packaging for OSX
+-----------------
+
+To package MonoDevelop for OSX in a convenient MonoDevelop.app
+file, just do this after MonoDevelop has finished building (with
+make):
+
+`cd main/build/MacOSX ; make MonoDevelop.app`
+
+Dependencies
+------------
+
+ Mono >= 3.0.4
+ Gtk# >= 2.12.8
+ monodoc >= 1.0
+ mono-addins >= 0.6
+
+Special Environment Variables
+-----------------------------
+
+BUILD_REVISION
+
+ If this environment variable exists we assume we are compiling inside wrench.
+ We use this to enable raygun only for 'release' builds and not for normal
+ developer builds compiled on a dev machine with 'make && make run'.
+
+
+References
+----------
+
+**MonoDevelop website**
+
+http://www.monodevelop.com
+
+**Gnome Human Interface Guidelines (HIG)**
+
+http://developer.gnome.org/projects/gup/hig/1.0/
+
+**freedesktop.org standards**
+
+http://freedesktop.org/Standards/
+
+**Integrating with GNOME (a little out of date)**
+
+http://developers.sun.com/solaris/articles/integrating_gnome.html
+
+**Bugzilla**
+
+http://bugzilla.mozilla.org/bugwritinghelp.html
+
+http://bugzilla.mozilla.org/page.cgi?id=etiquette.html
+
+Discussion, Bugs, Patches
+-------------------------
+
[email protected] *(questions and discussion)*
+
[email protected] *(track commits to MonoDevelop)*
+
[email protected] *(track MonoDevelop bugzilla component)*
+
+http://bugzilla.xamarin.com *(submit bugs and patches here)*
+
Commit: 9f89026902507355f76ea8997e906e911e366ac4
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-10-29 21:20:53 GMT
URL: https://github.com/mono/monodevelop/commit/9f89026902507355f76ea8997e906e911e366ac4
Merge pull request #424 from mono/readmeChange
[README] Replace old readme with markdown.
Added paths:
A README.md
Removed paths:
D README
Removed: README
===================================================================
@@ -1,116 +0,0 @@
-
-MonoDevelop is a full-featured integrated development environment (IDE) for mono
-and Gtk#. See http://www.monodevelop.com for more info.
-
-Directory organization
-----------------------
-
- There are two main directories:
-
- * main: The core MonoDevelop assemblies and add-ins (all in a single
- tarball/package).
- * extras: Additional add-ins (each add-in has its own
- tarball/package).
-
-Compiling
----------
-
- If you are building from Git, make sure that you initialize the submodules
- that are part of MonoDevelop, to do this execute:
-
- git submodule update --init --recursive
-
- To compile execute:
-
- ./configure
- make
-
- There are two variables you can set when running 'configure':
-
- --prefix=/path/to/prefix: To set the install prefix.
-
- you can use --prefix=`pkg-config --variable=prefix mono` to get MD
- installed with the rest of mono/gtk-sharp/etc.
-
- --profile=profile-name: To choose one build profile.
-
- There are some predefined profiles:
-
- * stable: builds the MonoDevelop core and some stable extra add-ins.
- * core: builds the MonoDevelop core only.
- * all: builds everything
-
- You can create your own profiles if you need to. To create a profile you
- only have to add a file to the profiles directory containing a list
- of the directories to build.
-
- You can run MonoDevelop from the build directory without having to
- install it by executing:
-
- make run
-
-Installing
-----------
-
- Installing is currently optional.
- (Use make run to use MonoDevelop without installing.)
-
- make install
-
- (It's possible that you need to install for your locale to be
- correctly set.)
-
-Packaging for OSX
------------------
-
- To package MonoDevelop for OSX in a convenient MonoDevelop.app
- file, just do this after MonoDevelop has finished building (with
- make):
-
- cd main/build/MacOSX
- make MonoDevelop.app
-
-Dependencies
-------------
-
- Mono >= 3.0.4
- Gtk# >= 2.12.8
- monodoc >= 1.0
- mono-addins >= 0.6
-
-Special Environment Variables
------------------------------
-
-BUILD_REVISION
- If this environment variable exists we assume we are compiling inside wrench.
- We use this to enable raygun only for 'release' builds and not for normal
- developer builds compiled on a dev machine with 'make && make run'.
-
-
-References
-----------
-
- MonoDevelop web site
- http://www.monodevelop.com
-
- Gnome Human Interface Guidelines (HIG)
- http://developer.gnome.org/projects/gup/hig/1.0/
-
- freedesktop.org standards
- http://freedesktop.org/Standards/
-
- Integrating with GNOME (a little out of date)
- http://developers.sun.com/solaris/articles/integrating_gnome.html
-
- Bugzilla
- http://bugzilla.mozilla.org/bugwritinghelp.html
- http://bugzilla.mozilla.org/page.cgi?id=etiquette.html
-
-Discussion, Bugs, Patches
--------------------------
-
- [email protected] (questions and discussion)
- [email protected] (track commits to MonoDevelop)
- [email protected] (track MonoDevelop bugzilla component)
- http://bugzilla.xamarin.com (submit bugs and patches here)
-
Added: README.md
===================================================================
@@ -0,0 +1,123 @@
+**MonoDevelop** is a full-featured integrated development environment (IDE) for mono
+using Gtk#.
+
+See http://www.monodevelop.com for more info.
+
+Directory organization
+----------------------
+
+There are two main directories:
+
+ * main: The core MonoDevelop assemblies and add-ins (all in a single
+ tarball/package).
+ * extras: Additional add-ins (each add-in has its own
+ tarball/package).
+
+Compiling
+---------
+
+If you are building from Git, make sure that you initialize the submodules
+that are part of MonoDevelop, to do this execute:
+
+`git submodule update --init --recursive`
+
+To compile execute:
+
+`./configure ; make`
+
+There are two variables you can set when running 'configure':
+
+`--prefix=/path/to/prefix: To set the install prefix.`
+
+You can use `--prefix="pkg-config --variable=prefix mono"` to get MD
+installed with the rest of mono/gtk-sharp/etc.
+
+`--profile=profile-name: To choose one build profile.`
+
+There are some predefined profiles:
+
+ * stable: builds the MonoDevelop core and some stable extra add-ins.
+ * core: builds the MonoDevelop core only.
+ * all: builds everything
+
+You can create your own profiles if you need to
+
+To create a profile you only have to add a file to the profiles directory
+containing a list of the directories to build.
+
+You can run MonoDevelop from the build directory without having to
+install it by executing:
+
+`make run`
+
+Installing *(Optional)*
+----------
+
+`make install`
+
+(It's possible that you need to install for your locale to be
+correctly set.)
+
+Packaging for OSX
+-----------------
+
+To package MonoDevelop for OSX in a convenient MonoDevelop.app
+file, just do this after MonoDevelop has finished building (with
+make):
+
+`cd main/build/MacOSX ; make MonoDevelop.app`
+
+Dependencies
+------------
+
+ Mono >= 3.0.4
+ Gtk# >= 2.12.8
+ monodoc >= 1.0
+ mono-addins >= 0.6
+
+Special Environment Variables
+-----------------------------
+
+BUILD_REVISION
+
+ If this environment variable exists we assume we are compiling inside wrench.
+ We use this to enable raygun only for 'release' builds and not for normal
+ developer builds compiled on a dev machine with 'make && make run'.
+
+
+References
+----------
+
+**MonoDevelop website**
+
+http://www.monodevelop.com
+
+**Gnome Human Interface Guidelines (HIG)**
+
+http://developer.gnome.org/projects/gup/hig/1.0/
+
+**freedesktop.org standards**
+
+http://freedesktop.org/Standards/
+
+**Integrating with GNOME (a little out of date)**
+
+http://developers.sun.com/solaris/articles/integrating_gnome.html
+
+**Bugzilla**
+
+http://bugzilla.mozilla.org/bugwritinghelp.html
+
+http://bugzilla.mozilla.org/page.cgi?id=etiquette.html
+
+Discussion, Bugs, Patches
+-------------------------
+
[email protected] *(questions and discussion)*
+
[email protected] *(track commits to MonoDevelop)*
+
[email protected] *(track MonoDevelop bugzilla component)*
+
+http://bugzilla.xamarin.com *(submit bugs and patches here)*
+
Commit: 8b0a591ea7ecf581de8820f1b74a1ac91f82200c
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-29 21:23:00 GMT
URL: https://github.com/mono/monodevelop/commit/8b0a591ea7ecf581de8820f1b74a1ac91f82200c
[README] Fix some inconsistency in formatted text.
Changed paths:
M README.md
Modified: README.md
===================================================================
@@ -27,12 +27,12 @@ To compile execute:
There are two variables you can set when running 'configure':
-`--prefix=/path/to/prefix: To set the install prefix.`
+`--prefix=/path/to/prefix`: To set the install prefix.
You can use `--prefix="pkg-config --variable=prefix mono"` to get MD
installed with the rest of mono/gtk-sharp/etc.
-`--profile=profile-name: To choose one build profile.`
+`--profile=profile-name`: To choose one build profile.
There are some predefined profiles:
Commit: 05a18c979a68842458c1b79bb9d22ab6d64e8292
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-29 21:36:59 GMT
URL: https://github.com/mono/monodevelop/commit/05a18c979a68842458c1b79bb9d22ab6d64e8292
[README] Fix more inconsistency in formatting.
Changed paths:
M README.md
Modified: README.md
===================================================================
@@ -27,12 +27,11 @@ To compile execute:
There are two variables you can set when running 'configure':
-`--prefix=/path/to/prefix`: To set the install prefix.
+To set the install prefix: `--prefix=/path/to/prefix`
-You can use `--prefix="pkg-config --variable=prefix mono"` to get MD
-installed with the rest of mono/gtk-sharp/etc.
+To install with the rest of the assemblies: `--prefix="pkg-config --variable=prefix mono"`
-`--profile=profile-name`: To choose one build profile.
+To choose a build profile: `--profile=profile-name`
There are some predefined profiles:
@@ -40,7 +39,7 @@ There are some predefined profiles:
* core: builds the MonoDevelop core only.
* all: builds everything
-You can create your own profiles if you need to
+You can create your own profiles if you need to.
To create a profile you only have to add a file to the profiles directory
containing a list of the directories to build.
Commit: 54e217676fa42f7cc167e3832efb92a4627a3245
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-29 21:42:11 GMT
URL: https://github.com/mono/monodevelop/commit/54e217676fa42f7cc167e3832efb92a4627a3245
[README] Final inconsistency fix. Love the new README.
Changed paths:
M README.md
Modified: README.md
===================================================================
@@ -27,11 +27,17 @@ To compile execute:
There are two variables you can set when running 'configure':
-To set the install prefix: `--prefix=/path/to/prefix`
+To set the install prefix:
-To install with the rest of the assemblies: `--prefix="pkg-config --variable=prefix mono"`
+`--prefix=/path/to/prefix`
-To choose a build profile: `--profile=profile-name`
+To install with the rest of the assemblies:
+
+`--prefix="pkg-config --variable=prefix mono"`
+
+To choose a build profile:
+
+`--profile=profile-name`
There are some predefined profiles:
@@ -52,11 +58,11 @@ install it by executing:
Installing *(Optional)*
----------
-`make install`
-
(It's possible that you need to install for your locale to be
correctly set.)
+`make install`
+
Packaging for OSX
-----------------
Commit: 2d4eb38006c02bd74891881eff08d08adab5f38c
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-29 23:27:59 GMT
URL: https://github.com/mono/monodevelop/commit/2d4eb38006c02bd74891881eff08d08adab5f38c
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]=e33359865d970df164c1cb7a0f6d89f938c79d34
+DEP_NEEDED_VERSION[0]=8be1486eb379635f42380c6ee1f031567e37f59f
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 7047976569cb469d13b50b45662cd2bb431d2467
Author: Michael Hutchinson <[email protected]> (mhutch)
Date: 2013-10-29 23:39:40 GMT
URL: https://github.com/mono/monodevelop/commit/7047976569cb469d13b50b45662cd2bb431d2467
Bump md-addins for build 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]=8be1486eb379635f42380c6ee1f031567e37f59f
+DEP_NEEDED_VERSION[0]=6bf0bd8861b7c02b137080297d5788c57b896ff7
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 8b97cc68923220d0fc50675de805e4b707125282
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-30 09:54:48 GMT
URL: https://github.com/mono/monodevelop/commit/8b97cc68923220d0fc50675de805e4b707125282
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 4546b5782ae47fda9b748952e33dfb990574e5d9
+Subproject commit 251ca363cc98faf1a179ffb690767d0971c9171b
Commit: 7b58473abbe8fdd782b3fcc125254dc23699043d
Author: lluis <[email protected]> (slluis)
Date: 2013-10-30 10:04:05 GMT
URL: https://github.com/mono/monodevelop/commit/7b58473abbe8fdd782b3fcc125254dc23699043d
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]=6bf0bd8861b7c02b137080297d5788c57b896ff7
+DEP_NEEDED_VERSION[0]=5a850755ad0fbc7b18bb3c652aef498e9f64dba7
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 6206ef40641de0bc6c9371215677d81a6af4220d
Author: lluis <[email protected]> (slluis)
Date: 2013-10-30 10:06:35 GMT
URL: https://github.com/mono/monodevelop/commit/6206ef40641de0bc6c9371215677d81a6af4220d
Updated references to ngit, xwt, debugger-libs, md-addins
Changed paths:
M main/external/debugger-libs
M main/external/ngit
M main/external/xwt
M version-checks
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit 5b6a5194b9b84f0395ce03d4fa7c594f43d0b2d1
+Subproject commit 6dc5f2b39855f284e354e7d92a87a0bec554591f
Modified: main/external/ngit
===================================================================
@@ -1 +1 @@
-Subproject commit 4f3290d81529f5ebc5b0b51d1bb7a1eb727537ac
+Subproject commit 278c05fd8e31c09bce840d348a8677e36f246ab4
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 5a249be65965b6151513ae8820c8d4574f6a2514
+Subproject commit 1392fb54b08abe4e07b9cc14c4c93fb7e8ef777c
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]=2581d4e32ca9f5aca93e6d245de9109b3447d613
+DEP_NEEDED_VERSION[0]=04348f1f480434d164009b100f07e4e52a4bb944
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 4dba13cb71747d38e405161621a56aca58958e2c
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-30 10:28:13 GMT
URL: https://github.com/mono/monodevelop/commit/4dba13cb71747d38e405161621a56aca58958e2c
[README] Reformat commands and change custom profile text.
Changed paths:
M README.md
Modified: README.md
===================================================================
@@ -18,25 +18,20 @@ Compiling
If you are building from Git, make sure that you initialize the submodules
that are part of MonoDevelop, to do this execute:
-
`git submodule update --init --recursive`
To compile execute:
-
`./configure ; make`
There are two variables you can set when running 'configure':
To set the install prefix:
-
`--prefix=/path/to/prefix`
To install with the rest of the assemblies:
-
`--prefix="pkg-config --variable=prefix mono"`
To choose a build profile:
-
`--profile=profile-name`
There are some predefined profiles:
@@ -45,24 +40,21 @@ There are some predefined profiles:
* core: builds the MonoDevelop core only.
* all: builds everything
-You can create your own profiles if you need to.
-
-To create a profile you only have to add a file to the profiles directory
+You can create your own profile by adding a file to the profiles directory
containing a list of the directories to build.
-You can run MonoDevelop from the build directory without having to
-install it by executing:
-
+You can run MonoDevelop from the build directory by executing:
`make run`
Installing *(Optional)*
----------
+You can install MonoDevelop by running:
+`make install`
+
(It's possible that you need to install for your locale to be
correctly set.)
-`make install`
-
Packaging for OSX
-----------------
@@ -83,7 +75,7 @@ Dependencies
Special Environment Variables
-----------------------------
-BUILD_REVISION
+**BUILD_REVISION**
If this environment variable exists we assume we are compiling inside wrench.
We use this to enable raygun only for 'release' builds and not for normal
@@ -105,7 +97,7 @@ http://developer.gnome.org/projects/gup/hig/1.0/
http://freedesktop.org/Standards/
-**Integrating with GNOME (a little out of date)**
+**Integrating with GNOME** *(a little out of date)*
http://developers.sun.com/solaris/articles/integrating_gnome.html
Commit: 71a6b0e5828abc50cea889a323c9f21cd82caaec
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-30 10:32:23 GMT
URL: https://github.com/mono/monodevelop/commit/71a6b0e5828abc50cea889a323c9f21cd82caaec
[README] Try better formatting.
Changed paths:
M README.md
Modified: README.md
===================================================================
@@ -8,16 +8,16 @@ Directory organization
There are two main directories:
- * main: The core MonoDevelop assemblies and add-ins (all in a single
+ * `main`: The core MonoDevelop assemblies and add-ins (all in a single
tarball/package).
- * extras: Additional add-ins (each add-in has its own
+ * `extras`: Additional add-ins (each add-in has its own
tarball/package).
Compiling
---------
If you are building from Git, make sure that you initialize the submodules
-that are part of MonoDevelop, to do this execute:
+that are part of this repository. To do this execute:
`git submodule update --init --recursive`
To compile execute:
@@ -25,23 +25,21 @@ To compile execute:
There are two variables you can set when running 'configure':
-To set the install prefix:
-`--prefix=/path/to/prefix`
+* The install prefix: `--prefix=/path/to/prefix`
-To install with the rest of the assemblies:
-`--prefix="pkg-config --variable=prefix mono"`
+ * To install with the rest of the assemblies, use:
+ `--prefix="pkg-config --variable=prefix mono"`
-To choose a build profile:
-`--profile=profile-name`
+* The build profile: `--profile=profile-name`
-There are some predefined profiles:
+ * `stable`: builds the MonoDevelop core and some stable extra add-ins.
+ * `core`: builds the MonoDevelop core only.
+ * `all`: builds everything
+ * You can also create your own profile by adding a file to the profiles
+directory containing a list of the directories to build.
- * stable: builds the MonoDevelop core and some stable extra add-ins.
- * core: builds the MonoDevelop core only.
- * all: builds everything
-
-You can create your own profile by adding a file to the profiles directory
-containing a list of the directories to build.
+Running
+-------
You can run MonoDevelop from the build directory by executing:
`make run`
@@ -52,8 +50,8 @@ Installing *(Optional)*
You can install MonoDevelop by running:
`make install`
-(It's possible that you need to install for your locale to be
-correctly set.)
+*(It's possible that you need to install for your locale to be
+correctly set.)*
Packaging for OSX
-----------------
@@ -61,7 +59,6 @@ Packaging for OSX
To package MonoDevelop for OSX in a convenient MonoDevelop.app
file, just do this after MonoDevelop has finished building (with
make):
-
`cd main/build/MacOSX ; make MonoDevelop.app`
Dependencies
Commit: 5ff3363ca179c5fdb634adca3d93fee02a66729f
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-30 10:34:48 GMT
URL: https://github.com/mono/monodevelop/commit/5ff3363ca179c5fdb634adca3d93fee02a66729f
[README] Final revision!
Changed paths:
M README.md
Modified: README.md
===================================================================
@@ -17,13 +17,13 @@ Compiling
---------
If you are building from Git, make sure that you initialize the submodules
-that are part of this repository. To do this execute:
+that are part of this repository by executing:
`git submodule update --init --recursive`
To compile execute:
`./configure ; make`
-There are two variables you can set when running 'configure':
+There are two variables you can set when running `configure`:
* The install prefix: `--prefix=/path/to/prefix`
@@ -58,7 +58,7 @@ Packaging for OSX
To package MonoDevelop for OSX in a convenient MonoDevelop.app
file, just do this after MonoDevelop has finished building (with
-make):
+`make`):
`cd main/build/MacOSX ; make MonoDevelop.app`
Dependencies
Commit: f6335f7622c2d6e866fcb9d6aec6a43974409948
Author: lluis <[email protected]> (slluis)
Date: 2013-10-30 10:53:59 GMT
URL: https://github.com/mono/monodevelop/commit/f6335f7622c2d6e866fcb9d6aec6a43974409948
Fixed target branch for cecil
Changed paths:
M .gitmodules
Modified: .gitmodules
===================================================================
@@ -1,6 +1,7 @@
[submodule "main/external/cecil"]
path = main/external/cecil
url = git://github.com/mono/cecil.git
+ branch = mono-3.0
[submodule "main/external/maccore"]
path = main/external/maccore
url = git://github.com/mono/maccore.git
Commit: 7ce9347534c0fac1967350a1682dcbd6721f036b
Author: lluis <[email protected]> (slluis)
Date: 2013-10-30 10:55:52 GMT
URL: https://github.com/mono/monodevelop/commit/7ce9347534c0fac1967350a1682dcbd6721f036b
Fixed target branch for raygun4net
Changed paths:
M .gitmodules
Modified: .gitmodules
===================================================================
@@ -41,3 +41,4 @@
[submodule "main/external/raygun4net"]
path = main/external/raygun4net
url = git://github.com/mono/raygun4net.git
+ branch = xshacks
Commit: e56374d4b509dc53ea6fa6892eaa708b2f23bb66
Author: lluis <[email protected]> (slluis)
Date: 2013-10-30 10:59:23 GMT
URL: https://github.com/mono/monodevelop/commit/e56374d4b509dc53ea6fa6892eaa708b2f23bb66
Fixed target branch for cecil
Changed paths:
M .gitmodules
Modified: .gitmodules
===================================================================
@@ -1,6 +1,7 @@
[submodule "main/external/cecil"]
path = main/external/cecil
url = git://github.com/mono/cecil.git
+ branch = mono-3.0
[submodule "main/external/mono-tools"]
path = main/external/mono-tools
url = git://github.com/mono/mono-tools.git
Commit: 614c78b40b8ef5fa717dde609a6cda6e1560e0bb
Author: lluis <[email protected]> (slluis)
Date: 2013-10-30 11:00:03 GMT
URL: https://github.com/mono/monodevelop/commit/614c78b40b8ef5fa717dde609a6cda6e1560e0bb
Fixed target branch for raygun4net
Changed paths:
M .gitmodules
Modified: .gitmodules
===================================================================
@@ -38,3 +38,4 @@
[submodule "main/external/raygun4net"]
path = main/external/raygun4net
url = git://github.com/mono/raygun4net.git
+ branch = xshacks
Commit: ad12186c16d1f6289129678373c1527a5f725e01
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-10-30 19:43:13 GMT
URL: https://github.com/mono/monodevelop/commit/ad12186c16d1f6289129678373c1527a5f725e01
updated debugger-libs
Changed paths:
M main/external/debugger-libs
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit 8c6cdc6a77abaf1a6ee75498c62c46474794a2b7
+Subproject commit c960db15c657047c424a578576c6af35ed81005e
Commit: 698fdcfb5ee87c74817fdd0f21413f8cccbb9368
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-10-31 04:46:04 GMT
URL: https://github.com/mono/monodevelop/commit/698fdcfb5ee87c74817fdd0f21413f8cccbb9368
[TextEditor] Added support for simplified chinese encoding detection.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextFileUtility.cs
M main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/TextFileReaderTests.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Utils/TextFileUtility.cs
===================================================================
@@ -61,6 +61,7 @@ static TextFileUtility ()
// Encoding verifiers
var verifierList = new List<Verifier> () {
new Utf8Verifier (),
+ new GB18030CodePageVerifier (),
new WindowsCodePageVerifier (),
new UnicodeVerifier (),
new BigEndianUnicodeVerifier (),
@@ -757,6 +758,88 @@ protected override void Init ()
}
}
}
+
+ /// <summary>
+ /// Try to detect chinese encoding.
+ /// </summary>
+ class GB18030CodePageVerifier : Verifier
+ {
+ const byte Valid = 1;
+ const byte Second = 2;
+ const byte Third = 3;
+ const byte Fourth = 4;
+ const byte NotValid = 5;
+
+ const byte LAST = 6;
+ static byte[][] table;
+ static Encoding EncodingWindows;
+
+ public override byte InitalState { get { return NotValid; } }
+
+ public override Encoding Encoding { get { return EncodingWindows; } }
+
+ public override byte[][] StateTable { get { return table; } }
+
+ public override bool IsEncodingValid (byte state)
+ {
+ return state == Valid;
+ }
+
+ int WindowsCodePage {
+ get {
+ return 54936;
+ }
+ }
+
+ public override bool IsSupported {
+ get {
+ try {
+ return Encoding.GetEncoding (WindowsCodePage) != null;
+ } catch (Exception) {
+ return false;
+ }
+ }
+ }
+
+ protected override void Init ()
+ {
+ EncodingWindows = Encoding.GetEncoding (WindowsCodePage);
+ table = new byte[LAST][];
+ table [0] = errorTable;
+ for (int i = 1; i < LAST; i++)
+ table [i] = new byte[(int)byte.MaxValue + 1];
+
+ for (int i = 0x00; i <= 0x80; i++)
+ table [Valid] [i] = Valid;
+ for (int i = 0x81; i <= 0xFE; i++)
+ table [Valid] [i] = Second;
+ table [Valid] [0xFF] = Error;
+
+ // need to encounter a multi byte sequence first.
+ for (int i = 0x00; i <= 0x80; i++)
+ table [NotValid] [i] = NotValid;
+ for (int i = 0x81; i <= 0xFE; i++)
+ table [NotValid] [i] = Second;
+ table [NotValid] [0xFF] = Error;
+
+ for (int i = 0x00; i <= 0xFF; i++)
+ table [Second] [i] = Error;
+ for (int i = 0x40; i <= 0xFE; i++)
+ table [Second] [i] = Valid;
+ for (int i = 0x30; i <= 0x39; i++)
+ table [Second] [i] = Third;
+
+ for (int i = 0x00; i <= 0xFF; i++)
+ table [Third] [i] = Error;
+ for (int i = 0x81; i <= 0xFE; i++)
+ table [Third] [i] = Fourth;
+
+ for (int i = 0x00; i <= 0xFF; i++)
+ table [Fourth] [i] = Error;
+ for (int i = 0x30; i <= 0x39; i++)
+ table [Fourth] [i] = Valid;
+ }
+ }
#endregion
}
}
Modified: main/src/core/MonoDevelop.TextEditor.Tests/Mono.TextEditor.Tests/TextFileReaderTests.cs
===================================================================
@@ -135,6 +135,14 @@ public void TestBug4564 ()
byte[] input = new byte[] { (byte)'a',(byte)'a', 0xEF, 0xBB, 0xBF };
Assert.AreEqual ("aa\uFEFF", TextFileUtility.GetText (input));
}
+
+ [Test()]
+ public void TestGB18030 ()
+ {
+ var src = "南北西东";
+ byte[] input = Encoding.GetEncoding (54936).GetBytes (src);
+ Assert.AreEqual (src, TextFileUtility.GetText (input));
+ }
}
}
Commit: 5de766e71b78125f3fe35e8ec3123b720fa327db
Author: lluis <[email protected]> (slluis)
Date: 2013-10-31 08:08:12 GMT
URL: https://github.com/mono/monodevelop/commit/5de766e71b78125f3fe35e8ec3123b720fa327db
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]=5a850755ad0fbc7b18bb3c652aef498e9f64dba7
+DEP_NEEDED_VERSION[0]=f32a765a5288166c29b15bf229fbdee11651f298
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 972377bb64a542c03fb1d9a1e392fb1c7135998f
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-31 14:56:17 GMT
URL: https://github.com/mono/monodevelop/commit/972377bb64a542c03fb1d9a1e392fb1c7135998f
Bug 15837 - Choosing to 'Revert to this revision' or 'Revert changes from this revision' with no revision selected causes an NRE and a TIE
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
===================================================================
@@ -124,15 +124,14 @@ public LogWidget (VersionControlDocumentInfo info)
vpaned1 = vpaned1.ReplaceWithWidget (new VPanedThin () { HandleWidget = separator }, true);
revertButton = new DocumentToolButton ("vc-revert-command", GettextCatalog.GetString ("Revert changes from this revision"));
-// revertButton.Sensitive = false;
+ revertButton.Sensitive = false;
revertButton.Clicked += new EventHandler (RevertRevisionClicked);
revertToButton = new DocumentToolButton ("vc-revert-command", GettextCatalog.GetString ("Revert to this revision"));
-// revertToButton.Sensitive = false;
+ revertToButton.Sensitive = false;
revertToButton.Clicked += new EventHandler (RevertToRevisionClicked);
refreshButton = new DocumentToolButton (Gtk.Stock.Refresh, GettextCatalog.GetString ("Refresh"));
-// refreshButton.Sensitive = false;
refreshButton.Clicked += new EventHandler (RefreshClicked);
searchEntry = new SearchEntry ();
@@ -596,6 +595,8 @@ void TreeSelectionChanged (object o, EventArgs args)
if (d == null)
return;
+
+ revertButton.Sensitive = revertToButton.Sensitive = true;
Gtk.TreeIter selectIter = Gtk.TreeIter.Zero;
bool select = false;
foreach (RevisionPath rp in info.Repository.GetRevisionChanges (d)) {
Commit: 85c37c50c311900cef0e13604d4b14562012249d
Author: Therzok <[email protected]> (Therzok)
Date: 2013-10-31 15:03:54 GMT
URL: https://github.com/mono/monodevelop/commit/85c37c50c311900cef0e13604d4b14562012249d
Improvements to previous commit.
Changed paths:
M main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs
===================================================================
@@ -304,6 +304,7 @@ void RefreshClicked (object src, EventArgs args)
{
ShowLoading ();
info.Start (true);
+ revertButton.Sensitive = revertToButton.Sensitive = false;
}
void HandleTreeviewFilesDiffLineActivated (object sender, EventArgs e)
Commit: 10959b407c781a7862d647f1c0ea9cb77f5a6f3d
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-10-31 15:22:05 GMT
URL: https://github.com/mono/monodevelop/commit/10959b407c781a7862d647f1c0ea9cb77f5a6f3d
Revert "updated debugger-libs"
This reverts commit ad12186c16d1f6289129678373c1527a5f725e01.
Changed paths:
M main/external/debugger-libs
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit c960db15c657047c424a578576c6af35ed81005e
+Subproject commit 8c6cdc6a77abaf1a6ee75498c62c46474794a2b7
Commit: 14314d84118ba81672e755391275846eb5355cb2
Author: lluis <[email protected]> (slluis)
Date: 2013-10-31 17:55:46 GMT
URL: https://github.com/mono/monodevelop/commit/14314d84118ba81672e755391275846eb5355cb2
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]=f32a765a5288166c29b15bf229fbdee11651f298
+DEP_NEEDED_VERSION[0]=1b302d4fdd88fcb224c3f6814affd39c95fdeedf
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 638113834365743a22eba94000f87ea4d42ec918
Author: alan <[email protected]> (alanmcgovern)
Date: 2013-10-31 20:53:23 GMT
URL: https://github.com/mono/monodevelop/commit/638113834365743a22eba94000f87ea4d42ec918
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]=1b302d4fdd88fcb224c3f6814affd39c95fdeedf
+DEP_NEEDED_VERSION[0]=75f9f39fa4b8b14649b5ab9f29f7f52fb75ac0d8
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 8c11fffda3703f00f7eeb72e4eeba82452126b5a
Author: alan <[email protected]> (alanmcgovern)
Date: 2013-10-31 22:55:50 GMT
URL: https://github.com/mono/monodevelop/commit/8c11fffda3703f00f7eeb72e4eeba82452126b5a
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]=75f9f39fa4b8b14649b5ab9f29f7f52fb75ac0d8
+DEP_NEEDED_VERSION[0]=f6cbd7bff43bbe1e81caff6f304615004c24c10a
DEP_BRANCH_AND_REMOTE[0]="license-sync origin/license-sync"
# heap-shot
Commit: 101c891710051067a2d690248dbe888abcf989cc
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-01 03:24:06 GMT
URL: https://github.com/mono/monodevelop/commit/101c891710051067a2d690248dbe888abcf989cc
Fixed 'Bug 15859 - Editor background should not change past column
marker'.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextViewMargin.cs
===================================================================
@@ -2442,7 +2442,7 @@ public void DrawRectangleWithRuler (Cairo.Context cr, double x, Cairo.Rectangle
cr.Fill ();
}
cr.Rectangle (divider, area.Y, right - divider, area.Height);
- cr.SetSourceColor (DimColor (color));
+ cr.SetSourceColor (color);
cr.Fill ();
if (beforeDividerWidth > 0) {
Commit: c6bc93447f80cbd3685716ab7b4b9a4b264023ad
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-01 03:34:53 GMT
URL: https://github.com/mono/monodevelop/commit/c6bc93447f80cbd3685716ab7b4b9a4b264023ad
[ILAsmBinding] Cleanup in files.
Changed paths:
M main/src/addins/ILAsmBinding/AddinInfo.cs
M main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs
M main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
M main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
M main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
Modified: main/src/addins/ILAsmBinding/AddinInfo.cs
===================================================================
@@ -1,7 +1,5 @@
-using System;
using Mono.Addins;
-using Mono.Addins.Description;
[assembly:Addin ("ILAsmBinding",
Namespace = "MonoDevelop",
Modified: main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.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.Core;
using MonoDevelop.Projects;
using Gtk;
@@ -32,17 +31,17 @@
namespace ILAsmBinding
{
[System.ComponentModel.ToolboxItem(true)]
- partial class CompilerParametersPanelWidget : Gtk.Bin
+ partial class CompilerParametersPanelWidget : Bin
{
public CompilerParametersPanelWidget()
{
this.Build();
- ListStore store = new ListStore (typeof (string));
+ var store = new ListStore (typeof (string));
store.AppendValues (GettextCatalog.GetString ("Executable"));
store.AppendValues (GettextCatalog.GetString ("Library"));
compileTargetCombo.Model = store;
- CellRendererText cr = new CellRendererText ();
+ var cr = new CellRendererText ();
compileTargetCombo.PackStart (cr, true);
compileTargetCombo.AddAttribute (cr, "text", 0);
}
@@ -59,11 +58,7 @@ public void Load (DotNetProject project, DotNetProjectConfiguration configuratio
public void Store ()
{
- if (compileTargetCombo.Active == 0) {
- project.CompileTarget = CompileTarget.Exe;
- } else {
- project.CompileTarget = CompileTarget.Library;
- }
+ project.CompileTarget = compileTargetCombo.Active == 0 ? CompileTarget.Exe : CompileTarget.Library;
configuration.DebugMode = checkbuttonIncludeDebugInfo.Active;
}
}
Modified: main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
===================================================================
@@ -53,10 +53,10 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
// ILAsmCompilerParameters compilerParameters = (ILAsmCompilerParameters)configuration.CompilationParameters ?? new ILAsmCompilerParameters ();
string outputName = configuration.CompiledOutputName;
- StringBuilder sb = new StringBuilder ();
+ var sb = new StringBuilder ();
sb.AppendFormat ("\"/output:{0}\" ", outputName);
- List<string> gacRoots = new List<string> ();
+ var gacRoots = new List<string> ();
switch (configuration.CompileTarget) {
@@ -90,13 +90,13 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
string ilasm = configuration.TargetRuntime.GetToolPath (configuration.TargetFramework, "ilasm");
if (ilasm == null) {
- BuildResult res = new BuildResult ();
+ var res = new BuildResult ();
res.AddError (GettextCatalog.GetString ("IL compiler (ilasm) not found."));
if (configuration.TargetRuntime is MsNetTargetRuntime)
res.AddError (GettextCatalog.GetString ("You may need to install the .NET SDK."));
return res;
}
- string outstr = ilasm + " " + sb.ToString ();
+ string outstr = ilasm + " " + sb;
monitor.Log.WriteLine (outstr);
string workingDir = ".";
@@ -110,7 +110,7 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
workingDir = ".";
}
- LoggingService.LogInfo ("ilasm " + sb.ToString ());
+ LoggingService.LogInfo ("ilasm " + sb);
var envVars = configuration.TargetRuntime.GetToolsExecutionEnvironment (configuration.TargetFramework);
int exitCode = DoCompilation (outstr, workingDir, envVars, gacRoots, ref output, ref error);
@@ -134,11 +134,11 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
static BuildResult ParseOutput (string stdout, string stderr)
{
- BuildResult result = new BuildResult ();
+ var result = new BuildResult ();
- StringBuilder compilerOutput = new StringBuilder ();
+ var compilerOutput = new StringBuilder ();
bool typeLoadException = false;
- foreach (string s in new string[] { stdout, stderr }) {
+ foreach (string s in new [] { stdout, stderr }) {
StreamReader sr = File.OpenText (s);
while (true) {
if (typeLoadException) {
@@ -155,8 +155,8 @@ static BuildResult ParseOutput (string stdout, string stderr)
if (curLine.Length == 0)
continue;
- if (curLine.StartsWith ("Unhandled Exception: System.TypeLoadException") ||
- curLine.StartsWith ("Unhandled Exception: System.IO.FileNotFoundException")) {
+ if (curLine.StartsWith ("Unhandled Exception: System.TypeLoadException", StringComparison.Ordinal) ||
+ curLine.StartsWith ("Unhandled Exception: System.IO.FileNotFoundException", StringComparison.Ordinal)) {
result.ClearErrors ();
typeLoadException = true;
}
@@ -169,7 +169,7 @@ static BuildResult ParseOutput (string stdout, string stderr)
sr.Close();
}
if (typeLoadException) {
- Regex reg = new Regex (@".*WARNING.*used in (mscorlib|System),.*", RegexOptions.Multiline);
+ var reg = new Regex (@".*WARNING.*used in (mscorlib|System),.*", RegexOptions.Multiline);
if (reg.Match (compilerOutput.ToString ()).Success)
result.AddError ("", 0, 0, "", "Error: A referenced assembly may be built with an incompatible CLR version. See the compilation output for more details.");
else
@@ -179,19 +179,19 @@ static BuildResult ParseOutput (string stdout, string stderr)
return result;
}
- static int DoCompilation (string outstr, string working_dir, ExecutionEnvironment envVars, List<string> gacRoots, ref string output, ref string error)
+ static int DoCompilation (string outstr, string workingDir, ExecutionEnvironment envVars, List<string> gacRoots, ref string output, ref string error)
{
output = Path.GetTempFileName();
error = Path.GetTempFileName();
- StreamWriter outwr = new StreamWriter (output);
- StreamWriter errwr = new StreamWriter (error);
+ var outwr = new StreamWriter (output);
+ var errwr = new StreamWriter (error);
string[] tokens = outstr.Split (' ');
outstr = outstr.Substring (tokens[0].Length+1);
- ProcessStartInfo pinfo = new ProcessStartInfo (tokens[0], outstr);
- pinfo.WorkingDirectory = working_dir;
+ var pinfo = new ProcessStartInfo (tokens[0], outstr);
+ pinfo.WorkingDirectory = workingDir;
if (gacRoots.Count > 0) {
// Create the gac prefix string
@@ -208,7 +208,7 @@ static int DoCompilation (string outstr, string working_dir, ExecutionEnvironmen
pinfo.RedirectStandardOutput = true;
pinfo.RedirectStandardError = true;
- MonoDevelop.Core.Execution.ProcessWrapper pw = Runtime.ProcessService.StartProcess (pinfo, outwr, errwr, null);
+ ProcessWrapper pw = Runtime.ProcessService.StartProcess (pinfo, outwr, errwr, null);
pw.WaitForOutput();
int exitCode = pw.ExitCode;
outwr.Close();
@@ -217,21 +217,21 @@ static int DoCompilation (string outstr, string working_dir, ExecutionEnvironmen
return exitCode;
}
- static Regex regexError = new Regex (@"^(\s*(?<file>.*?)\s?\((?<line>\d*)(,\s(?<column>\d*[\+]*))?\)\s(:|)\s+)*(?<level>\w+)\s*(:|(--))\s*(?<message>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
- static BuildError CreateErrorFromString (string error_string)
+ static readonly Regex regexError = new Regex (@"^(\s*(?<file>.*?)\s?\((?<line>\d*)(,\s(?<column>\d*[\+]*))?\)\s(:|)\s+)*(?<level>\w+)\s*(:|(--))\s*(?<message>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+ static BuildError CreateErrorFromString (string errorString)
{
// When IncludeDebugInformation is true, prevents the debug symbols stats from breaking this.
- if (error_string.StartsWith ("WROTE SYMFILE") ||
- error_string.StartsWith ("OffsetTable") ||
- error_string.StartsWith ("Compilation succeeded") ||
- error_string.StartsWith ("Compilation failed"))
+ if (errorString.StartsWith ("WROTE SYMFILE", StringComparison.Ordinal) ||
+ errorString.StartsWith ("OffsetTable", StringComparison.Ordinal) ||
+ errorString.StartsWith ("Compilation succeeded", StringComparison.Ordinal) ||
+ errorString.StartsWith ("Compilation failed", StringComparison.Ordinal))
return null;
- Match match = regexError.Match(error_string);
+ Match match = regexError.Match(errorString);
if (!match.Success)
return null;
- BuildError error = new BuildError ();
+ var error = new BuildError ();
error.FileName = match.Result ("${file}") ?? "";
string line = match.Result ("${line}");
Modified: main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
===================================================================
@@ -49,7 +49,7 @@ class ILAsmLanguageBinding : IDotNetLanguageBinding
public bool IsSourceCodeFile (FilePath fileName)
{
- return string.Compare (Path.GetExtension (fileName), ".il", true) == 0;
+ return String.Compare (Path.GetExtension (fileName), ".il", StringComparison.OrdinalIgnoreCase) == 0;
}
public BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
@@ -83,7 +83,7 @@ public FilePath GetFileName (FilePath baseName)
public ClrVersion[] GetSupportedClrVersions ()
{
- return new ClrVersion[] {
+ return new [] {
ClrVersion.Net_1_1,
ClrVersion.Net_2_0,
ClrVersion.Clr_2_1,
Modified: main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
===================================================================
@@ -24,8 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-
namespace ILAsmBinding
{
class ILAsmCompilerParameters : MonoDevelop.Projects.ConfigurationParameters
Commit: cb3a3768de4631d3ee592c486cf0ddb4baa5223e
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-11-01 03:36:23 GMT
URL: https://github.com/mono/monodevelop/commit/cb3a3768de4631d3ee592c486cf0ddb4baa5223e
Merge pull request #425 from mono/ilasmCleanup
[ILAsmBinding] Cleanup in files.
Changed paths:
M main/src/addins/ILAsmBinding/AddinInfo.cs
M main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs
M main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
M main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
M main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
Modified: main/src/addins/ILAsmBinding/AddinInfo.cs
===================================================================
@@ -1,7 +1,5 @@
-using System;
using Mono.Addins;
-using Mono.Addins.Description;
[assembly:Addin ("ILAsmBinding",
Namespace = "MonoDevelop",
Modified: main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.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.Core;
using MonoDevelop.Projects;
using Gtk;
@@ -32,17 +31,17 @@
namespace ILAsmBinding
{
[System.ComponentModel.ToolboxItem(true)]
- partial class CompilerParametersPanelWidget : Gtk.Bin
+ partial class CompilerParametersPanelWidget : Bin
{
public CompilerParametersPanelWidget()
{
this.Build();
- ListStore store = new ListStore (typeof (string));
+ var store = new ListStore (typeof (string));
store.AppendValues (GettextCatalog.GetString ("Executable"));
store.AppendValues (GettextCatalog.GetString ("Library"));
compileTargetCombo.Model = store;
- CellRendererText cr = new CellRendererText ();
+ var cr = new CellRendererText ();
compileTargetCombo.PackStart (cr, true);
compileTargetCombo.AddAttribute (cr, "text", 0);
}
@@ -59,11 +58,7 @@ public void Load (DotNetProject project, DotNetProjectConfiguration configuratio
public void Store ()
{
- if (compileTargetCombo.Active == 0) {
- project.CompileTarget = CompileTarget.Exe;
- } else {
- project.CompileTarget = CompileTarget.Library;
- }
+ project.CompileTarget = compileTargetCombo.Active == 0 ? CompileTarget.Exe : CompileTarget.Library;
configuration.DebugMode = checkbuttonIncludeDebugInfo.Active;
}
}
Modified: main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
===================================================================
@@ -53,10 +53,10 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
// ILAsmCompilerParameters compilerParameters = (ILAsmCompilerParameters)configuration.CompilationParameters ?? new ILAsmCompilerParameters ();
string outputName = configuration.CompiledOutputName;
- StringBuilder sb = new StringBuilder ();
+ var sb = new StringBuilder ();
sb.AppendFormat ("\"/output:{0}\" ", outputName);
- List<string> gacRoots = new List<string> ();
+ var gacRoots = new List<string> ();
switch (configuration.CompileTarget) {
@@ -90,13 +90,13 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
string ilasm = configuration.TargetRuntime.GetToolPath (configuration.TargetFramework, "ilasm");
if (ilasm == null) {
- BuildResult res = new BuildResult ();
+ var res = new BuildResult ();
res.AddError (GettextCatalog.GetString ("IL compiler (ilasm) not found."));
if (configuration.TargetRuntime is MsNetTargetRuntime)
res.AddError (GettextCatalog.GetString ("You may need to install the .NET SDK."));
return res;
}
- string outstr = ilasm + " " + sb.ToString ();
+ string outstr = ilasm + " " + sb;
monitor.Log.WriteLine (outstr);
string workingDir = ".";
@@ -110,7 +110,7 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
workingDir = ".";
}
- LoggingService.LogInfo ("ilasm " + sb.ToString ());
+ LoggingService.LogInfo ("ilasm " + sb);
var envVars = configuration.TargetRuntime.GetToolsExecutionEnvironment (configuration.TargetFramework);
int exitCode = DoCompilation (outstr, workingDir, envVars, gacRoots, ref output, ref error);
@@ -134,11 +134,11 @@ public static BuildResult Compile (ProjectItemCollection projectItems, DotNetPro
static BuildResult ParseOutput (string stdout, string stderr)
{
- BuildResult result = new BuildResult ();
+ var result = new BuildResult ();
- StringBuilder compilerOutput = new StringBuilder ();
+ var compilerOutput = new StringBuilder ();
bool typeLoadException = false;
- foreach (string s in new string[] { stdout, stderr }) {
+ foreach (string s in new [] { stdout, stderr }) {
StreamReader sr = File.OpenText (s);
while (true) {
if (typeLoadException) {
@@ -155,8 +155,8 @@ static BuildResult ParseOutput (string stdout, string stderr)
if (curLine.Length == 0)
continue;
- if (curLine.StartsWith ("Unhandled Exception: System.TypeLoadException") ||
- curLine.StartsWith ("Unhandled Exception: System.IO.FileNotFoundException")) {
+ if (curLine.StartsWith ("Unhandled Exception: System.TypeLoadException", StringComparison.Ordinal) ||
+ curLine.StartsWith ("Unhandled Exception: System.IO.FileNotFoundException", StringComparison.Ordinal)) {
result.ClearErrors ();
typeLoadException = true;
}
@@ -169,7 +169,7 @@ static BuildResult ParseOutput (string stdout, string stderr)
sr.Close();
}
if (typeLoadException) {
- Regex reg = new Regex (@".*WARNING.*used in (mscorlib|System),.*", RegexOptions.Multiline);
+ var reg = new Regex (@".*WARNING.*used in (mscorlib|System),.*", RegexOptions.Multiline);
if (reg.Match (compilerOutput.ToString ()).Success)
result.AddError ("", 0, 0, "", "Error: A referenced assembly may be built with an incompatible CLR version. See the compilation output for more details.");
else
@@ -179,19 +179,19 @@ static BuildResult ParseOutput (string stdout, string stderr)
return result;
}
- static int DoCompilation (string outstr, string working_dir, ExecutionEnvironment envVars, List<string> gacRoots, ref string output, ref string error)
+ static int DoCompilation (string outstr, string workingDir, ExecutionEnvironment envVars, List<string> gacRoots, ref string output, ref string error)
{
output = Path.GetTempFileName();
error = Path.GetTempFileName();
- StreamWriter outwr = new StreamWriter (output);
- StreamWriter errwr = new StreamWriter (error);
+ var outwr = new StreamWriter (output);
+ var errwr = new StreamWriter (error);
string[] tokens = outstr.Split (' ');
outstr = outstr.Substring (tokens[0].Length+1);
- ProcessStartInfo pinfo = new ProcessStartInfo (tokens[0], outstr);
- pinfo.WorkingDirectory = working_dir;
+ var pinfo = new ProcessStartInfo (tokens[0], outstr);
+ pinfo.WorkingDirectory = workingDir;
if (gacRoots.Count > 0) {
// Create the gac prefix string
@@ -208,7 +208,7 @@ static int DoCompilation (string outstr, string working_dir, ExecutionEnvironmen
pinfo.RedirectStandardOutput = true;
pinfo.RedirectStandardError = true;
- MonoDevelop.Core.Execution.ProcessWrapper pw = Runtime.ProcessService.StartProcess (pinfo, outwr, errwr, null);
+ ProcessWrapper pw = Runtime.ProcessService.StartProcess (pinfo, outwr, errwr, null);
pw.WaitForOutput();
int exitCode = pw.ExitCode;
outwr.Close();
@@ -217,21 +217,21 @@ static int DoCompilation (string outstr, string working_dir, ExecutionEnvironmen
return exitCode;
}
- static Regex regexError = new Regex (@"^(\s*(?<file>.*?)\s?\((?<line>\d*)(,\s(?<column>\d*[\+]*))?\)\s(:|)\s+)*(?<level>\w+)\s*(:|(--))\s*(?<message>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
- static BuildError CreateErrorFromString (string error_string)
+ static readonly Regex regexError = new Regex (@"^(\s*(?<file>.*?)\s?\((?<line>\d*)(,\s(?<column>\d*[\+]*))?\)\s(:|)\s+)*(?<level>\w+)\s*(:|(--))\s*(?<message>.*)", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+ static BuildError CreateErrorFromString (string errorString)
{
// When IncludeDebugInformation is true, prevents the debug symbols stats from breaking this.
- if (error_string.StartsWith ("WROTE SYMFILE") ||
- error_string.StartsWith ("OffsetTable") ||
- error_string.StartsWith ("Compilation succeeded") ||
- error_string.StartsWith ("Compilation failed"))
+ if (errorString.StartsWith ("WROTE SYMFILE", StringComparison.Ordinal) ||
+ errorString.StartsWith ("OffsetTable", StringComparison.Ordinal) ||
+ errorString.StartsWith ("Compilation succeeded", StringComparison.Ordinal) ||
+ errorString.StartsWith ("Compilation failed", StringComparison.Ordinal))
return null;
- Match match = regexError.Match(error_string);
+ Match match = regexError.Match(errorString);
if (!match.Success)
return null;
- BuildError error = new BuildError ();
+ var error = new BuildError ();
error.FileName = match.Result ("${file}") ?? "";
string line = match.Result ("${line}");
Modified: main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
===================================================================
@@ -49,7 +49,7 @@ class ILAsmLanguageBinding : IDotNetLanguageBinding
public bool IsSourceCodeFile (FilePath fileName)
{
- return string.Compare (Path.GetExtension (fileName), ".il", true) == 0;
+ return String.Compare (Path.GetExtension (fileName), ".il", StringComparison.OrdinalIgnoreCase) == 0;
}
public BuildResult Compile (ProjectItemCollection projectItems, DotNetProjectConfiguration configuration, ConfigurationSelector configSelector, IProgressMonitor monitor)
@@ -83,7 +83,7 @@ public FilePath GetFileName (FilePath baseName)
public ClrVersion[] GetSupportedClrVersions ()
{
- return new ClrVersion[] {
+ return new [] {
ClrVersion.Net_1_1,
ClrVersion.Net_2_0,
ClrVersion.Clr_2_1,
Modified: main/src/addins/ILAsmBinding/Project/ILAsmCompilerParameters.cs
===================================================================
@@ -24,8 +24,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-using System;
-
namespace ILAsmBinding
{
class ILAsmCompilerParameters : MonoDevelop.Projects.ConfigurationParameters
Commit: b8b0ac34c88d3b84d8bfcf8871f604c1b8b20f6e
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-01 03:36:27 GMT
URL: https://github.com/mono/monodevelop/commit/b8b0ac34c88d3b84d8bfcf8871f604c1b8b20f6e
Fixed 'Bug 15858 - Renaming a derived class changes the base class'
finalizer'.
Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs
Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/ReferencesFinder.cs
===================================================================
@@ -253,7 +253,7 @@ internal static IEnumerable<IEntity> CollectMembers (IType type)
yield return c;
}
- foreach (var m in type.GetMethods (m => m.IsDestructor)) {
+ foreach (var m in type.GetMethods (m => m.IsDestructor, GetMemberOptions.IgnoreInheritedMembers)) {
yield return m;
}
}
Commit: ebd0ce8b4a8e390cf6a2409887f0d867eb9ba408
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-01 03:43:26 GMT
URL: https://github.com/mono/monodevelop/commit/ebd0ce8b4a8e390cf6a2409887f0d867eb9ba408
Replace reference equality with value equality for valuetypes.
Changed paths:
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViKeyNotation.cs
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViKeyNotation.cs
===================================================================
@@ -86,7 +86,7 @@ public override bool Equals (object obj)
{
if (obj == null)
return false;
- if (ReferenceEquals (this, obj))
+ if (object.Equals (this, obj))
return true;
if (!(obj is ViKey))
return false;
Commit: 5fddca2c7b1f4643e04059c138d1c8dd5923de50
Author: Mike Krüger <[email protected]> (mkrueger)
Date: 2013-11-01 03:53:54 GMT
URL: https://github.com/mono/monodevelop/commit/5fddca2c7b1f4643e04059c138d1c8dd5923de50
Bump nrefactory.
Changed paths:
M main/external/nrefactory
Modified: main/external/nrefactory
===================================================================
@@ -1 +1 @@
-Subproject commit 251ca363cc98faf1a179ffb690767d0971c9171b
+Subproject commit a01f5b37b0ddcb072b63a55b0fa4b91cbcd716c1
Commit: e70f879f9c7427803a3ee25df61b1c9e139434a4
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-01 03:56:20 GMT
URL: https://github.com/mono/monodevelop/commit/e70f879f9c7427803a3ee25df61b1c9e139434a4
[GtkCore] Fix a conditional which never passed.
Changed paths:
M main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
Modified: main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
===================================================================
@@ -126,7 +126,7 @@ public string GetCategory (IEntity decoration)
var pargs = at.PositionalArguments;
if (pargs != null && pargs.Count > 0) {
var val = pargs[0] as ConstantResolveResult;
- if (val is string)
+ if (val != null && val.ConstantValue is string)
return val.ConstantValue.ToString ();
}
}
Commit: c2123cc6c039fb2cb5ef16f6a702d3b91d6e6653
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-01 04:28:29 GMT
URL: https://github.com/mono/monodevelop/commit/c2123cc6c039fb2cb5ef16f6a702d3b91d6e6653
Fix infinite loops.
Changed paths:
M main/src/addins/MacPlatform/MacInterop/Carbon.cs
M main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CustomDescriptor.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/addins/MacPlatform/MacInterop/Carbon.cs
===================================================================
@@ -570,7 +570,7 @@ struct OSType {
int value;
public int Value {
- get { return Value; }
+ get { return value; }
}
public OSType (int value)
Modified: main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CustomDescriptor.cs
===================================================================
@@ -165,7 +165,7 @@ public override void AddValueChanged (object component, EventHandler handler)
public override void RemoveValueChanged (object component, EventHandler handler)
{
- RemoveValueChanged (component, handler);
+ prop.RemoveValueChanged (component, handler);
}
public override object GetValue (object component)
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -160,7 +160,7 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown)
internal static void ReportUnhandledException (Exception ex, bool willShutDown, bool silently)
{
- ReportUnhandledException (ex, willShutDown, silently);
+ ReportUnhandledException (ex, willShutDown, silently, null);
}
internal static void ReportUnhandledException (Exception ex, bool willShutDown, bool silently, string tag)
Commit: 8c24502e8d4f6b1bd1daa78ff6d8e7de49b92c88
Author: Ungureanu Marius <[email protected]> (Therzok)
Date: 2013-11-01 04:38:33 GMT
URL: https://github.com/mono/monodevelop/commit/8c24502e8d4f6b1bd1daa78ff6d8e7de49b92c88
Merge pull request #426 from mono/codeIssueFixes
Functionality and code issues fixes
Changed paths:
M main/src/addins/MacPlatform/MacInterop/Carbon.cs
M main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CustomDescriptor.cs
M main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
M main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViKeyNotation.cs
M main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
Modified: main/src/addins/MacPlatform/MacInterop/Carbon.cs
===================================================================
@@ -570,7 +570,7 @@ struct OSType {
int value;
public int Value {
- get { return Value; }
+ get { return value; }
}
public OSType (int value)
Modified: main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CustomDescriptor.cs
===================================================================
@@ -165,7 +165,7 @@ public override void AddValueChanged (object component, EventHandler handler)
public override void RemoveValueChanged (object component, EventHandler handler)
{
- RemoveValueChanged (component, handler);
+ prop.RemoveValueChanged (component, handler);
}
public override object GetValue (object component)
Modified: main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetParser.cs
===================================================================
@@ -126,7 +126,7 @@ public string GetCategory (IEntity decoration)
var pargs = at.PositionalArguments;
if (pargs != null && pargs.Count > 0) {
var val = pargs[0] as ConstantResolveResult;
- if (val is string)
+ if (val != null && val.ConstantValue is string)
return val.ConstantValue.ToString ();
}
}
Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Vi/ViKeyNotation.cs
===================================================================
@@ -86,7 +86,7 @@ public override bool Equals (object obj)
{
if (obj == null)
return false;
- if (ReferenceEquals (this, obj))
+ if (object.Equals (this, obj))
return true;
if (!(obj is ViKey))
return false;
Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Core/LoggingService.cs
===================================================================
@@ -160,7 +160,7 @@ internal static void ReportUnhandledException (Exception ex, bool willShutDown)
internal static void ReportUnhandledException (Exception ex, bool willShutDown, bool silently)
{
- ReportUnhandledException (ex, willShutDown, silently);
+ ReportUnhandledException (ex, willShutDown, silently, null);
}
internal static void ReportUnhandledException (Exception ex, bool willShutDown, bool silently, string tag)
Commit: 2d6a2bf76fdd7a1805b27ca69882b16d304c433b
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-01 08:54:28 GMT
URL: https://github.com/mono/monodevelop/commit/2d6a2bf76fdd7a1805b27ca69882b16d304c433b
Merge branch 'license-sync'
Conflicts:
.gitmodules
README
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/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/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/src/core/MonoDevelop.Core/BuildVariables.cs
M main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
M main/tests/TestRunner/TestRunner.csproj
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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "AspNetEdit.dll"/>
@@ -14,11 +14,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Deployment" version="4.1.7" />
- <Addin id="AspNet" version="4.1.7" />
- <Addin id="DesignerSupport" version="4.1.7" />
+ <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" />
</Dependencies>
<Extension path = "/MonoDevelop/Ide/DisplayBindings">
Modified: extras/AspNetEdit/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "BooBinding.dll"/>
@@ -16,8 +16,8 @@
<Localizer type="Gettext" catalog="monodevelop-boo"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
<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.7
+VERSION=4.1.13
PACKAGE=monodevelop-boo
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.1.7 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.1.13 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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Ide" version = "4.1.7"/>
+ <Addin id = "Ide" version = "4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/GeckoWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7"
+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"
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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.SourceEditor.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
<Localizer type="Gettext" catalog="monodevelop-java"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/Ide/FileFilters">
Modified: extras/JavaBinding/configure
===================================================================
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "LuaBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="VersionControl" version="4.1.13"/>
</Dependencies>
<!-- Extension Points -->
Modified: extras/MonoDevelop.AddinAuthoring/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
PACKAGE=monodevelop_addinauthoring
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.7 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
+common_packages=" monodevelop;4.1.13 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.7">
+ version = "4.1.13">
<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.7">
+ version = "4.1.13">
<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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
@@ -15,11 +15,11 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Query" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Components.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
@@ -15,12 +15,12 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Query" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Designer.dll"/>
@@ -15,9 +15,9 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Database.Sql" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Query.dll"/>
@@ -15,10 +15,10 @@
<Localizer type="Gettext" catalog="monodevelop-database"/>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Database.Sql" version="4.1.7"/>
- <Addin id="Database.Components" version="4.1.7"/>
- <Addin id="Database.Designer" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
+ <Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Database.Sql.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
</Dependencies>
<Localizer type="Gettext" catalog="monodevelop-database"/>
Modified: extras/MonoDevelop.Database/configure.in
===================================================================
@@ -1,9 +1,9 @@
-AC_INIT([monodevelop-database], 4.1.7, [[email protected]])
+AC_INIT([monodevelop-database], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, dmcs)
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.4
-MONODEVELOP_REQUIRED_VERSION=4.1.7
+MONODEVELOP_REQUIRED_VERSION=4.1.13
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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
+ <Addin id="MonoDevelop.Core" version="4.1.13"/>
+ <Addin id="MonoDevelop.Ide" version="4.1.13"/>
+ <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Gdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
PACKAGE=monodevelop-debugger-gdb
prefix=/usr/local
config=DEBUG
configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.7"
+common_packages=" monodevelop;4.1.13"
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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger.Mdb" version="4.1.7"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
+ <Addin id="MonoDevelop.Core" version="4.1.13"/>
+ <Addin id="MonoDevelop.Ide" version="4.1.13"/>
+ <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
</Dependencies>
<Extension path="/MonoDevelop/Debugging/DebuggerEngines">
Modified: extras/MonoDevelop.Debugger.Mdb/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.1.13 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.7">
+ version = "4.1.13">
<Runtime>
<Import file = "Templates/MeeGoGtkProject.xpt.xml"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Debugger" version="4.1.7"/>
- <Addin id="Debugger.Soft" version="4.1.7"/>
- <Addin id="GtkCore" version="4.1.7"/>
- <Addin id="CSharpBinding" version="4.1.7"/>
+ <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"/>
</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.7 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 monodevelop;4.1.13 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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapBuddy.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Profiling" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Profiling" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Profiling.HeapShot.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Profiling" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Profiling" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.Profiling.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</Dependencies>
<ExtensionPoint path = "/MonoDevelop/Profiling/ToolBar/ProfilingPad" name = "Profiling pad toolbar">
Modified: extras/MonoDevelop.Profiling/configure.in
===================================================================
@@ -1,9 +1,9 @@
-AC_INIT([monodevelop-profiling], 4.1.7, [[email protected]])
+AC_INIT([monodevelop-profiling], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
AM_MAINTAINER_MODE
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, dmcs)
@@ -42,7 +42,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
-MONODEVELOP_REQUIRED_VERSION=4.1.7
+MONODEVELOP_REQUIRED_VERSION=4.1.13
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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "NemerleBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import file = "OpenOfficeSpreadsheetSample.xpt.xml"/>
@@ -18,8 +18,8 @@
</Runtime>
<Dependencies>
- <Addin id = "Ide" version="4.1.7"/>
- <Addin id = "CSharpBinding" version = "4.1.7" />
+ <Addin id = "Ide" version="4.1.13"/>
+ <Addin id = "CSharpBinding" version = "4.1.13" />
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "PyBinding.dll"/>
</Runtime>
<Dependencies>
- <Addin id = "Core" version = "4.1.7"/>
- <Addin id = "Ide" version = "4.1.7"/>
- <Addin id = "SourceEditor2" version = "4.1.7"/>
+ <Addin id = "Core" version = "4.1.13"/>
+ <Addin id = "Ide" version = "4.1.13"/>
+ <Addin id = "SourceEditor2" version = "4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/PyBinding/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7 monodevelop-core-addins;2.7"
+common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.1.13 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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Core" version = "4.1.7"/>
- <Addin id = "Ide" version = "4.1.7"/>
- <Addin id = "Deployment" version = "4.1.7"/>
- <Addin id = "Deployment.Linux" version = "4.1.7"/>
- <Addin id = "Autotools" version = "4.1.7"/>
+ <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"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
Modified: extras/ValaBinding/configure.in
===================================================================
@@ -1,9 +1,9 @@
-AC_INIT([monodevelop-vala], 4.1.7, [[email protected]])
+AC_INIT([monodevelop-vala], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE(1.9 tar-ustar)
AM_MAINTAINER_MODE
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, dmcs)
@@ -52,7 +52,7 @@ fi
dnl hard dependencies
MONOADDINS_REQUIRED_VERSION=0.3
GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.1.7
+MONODEVELOP_REQUIRED_VERSION=4.1.13
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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Ide" version = "4.1.7"/>
+ <Addin id = "Ide" version = "4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/WebBrowsers">
Modified: extras/WebKitWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-VERSION=4.1.7
+VERSION=4.1.13
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.7 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.1.13 webkit-sharp-1.0;0.2"
usage ()
Modified: main/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 4.1.7, [[email protected]])
+AC_INIT([monodevelop], 4.1.13, [[email protected]])
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([1.10 tar-ustar])
AM_MAINTAINER_MODE
@@ -6,13 +6,13 @@ AM_MAINTAINER_MODE
#capture aclocal flags for autoreconf
AC_SUBST(ACLOCAL_FLAGS)
-ASSEMBLY_VERSION=4.1.7.0
+ASSEMBLY_VERSION=4.0.0.0
# This is parsed in BuildVariables.cs. Keep the format consistent to avoid breaking
# 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.7"
+PACKAGE_VERSION_LABEL="4.1.13"
COMPAT_ADDIN_VERSION=4.0
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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id = "Core" version = "4.1.7"/>
- <Addin id = "Ide" version = "4.1.7"/>
- <Addin id = "Deployment" version = "4.1.7"/>
- <Addin id = "Deployment.Linux" version = "4.1.7"/>
- <Addin id = "SourceEditor2" version = "4.1.7" />
- <Addin id = "DesignerSupport" version = "4.1.7" />
- <Addin id = "Refactoring" version = "4.1.7" />
+ <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" />
</Dependencies>
<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -241,7 +241,7 @@
</Runtime>
<Dependencies>
- <Addin id = "MonoDevelop.Autotools" version = "4.1.7"/>
+ <Addin id = "MonoDevelop.Autotools" version = "4.1.13"/>
</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.7"/>
+ <Addin id="Autotools" version="4.1.13"/>
</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.7"/>
+ <Addin id="AspNet" version="4.1.13"/>
</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.7"
+ version = "4.1.13"
flags = "Hidden"
compatVersion = "4.0">
@@ -15,9 +15,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="Deployment" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="Deployment" version="4.1.13"/>
</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.7"
+ version = "4.1.13"
flags = "Hidden"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="DesignerSupport" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly = "MonoDevelop.CodeMetrics.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.Moonlight" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger.Soft" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
+ <Addin id="MonoDevelop.Core" version="4.1.13"/>
+ <Addin id="MonoDevelop.Debugger" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="MonoDevelop.Core" version="4.1.7"/>
- <Addin id="MonoDevelop.Ide" version="4.1.7"/>
- <Addin id="MonoDevelop.Debugger" version="4.1.7"/>
- <Addin id="MonoDevelop.AspNet" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="libstetic.dll"/>
@@ -17,9 +17,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="DesignerSupport" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="libstetic2.dll"/>
@@ -17,11 +17,11 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
- <Addin id="XmlEditor" version="4.1.7"/>
- <Addin id="Refactoring" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
- <Addin id="Deployment" version="4.1.7"/>
- <Addin id="AspNet" version="4.1.7" />
+ <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" />
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.XmlEditor.dll" />
@@ -21,10 +21,10 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="DesignerSupport" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDeveloperExtensions.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/ProjectModel/FileFormats">
@@ -51,7 +51,7 @@
<Import assembly="MonoDeveloperExtensions_nunit.dll"/>
</Runtime>
<Dependencies>
- <Addin id="NUnit" version="4.1.7"/>
+ <Addin id="NUnit" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.NUnit.dll" />
@@ -17,8 +17,8 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="Mono.TextTemplating.dll" />
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="SourceEditor2" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="MonoDevelop.VersionControl.Git.dll"/>
@@ -14,9 +14,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="VersionControl" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
- <Addin id="VersionControl.Subversion" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="VersionControl" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import file="comment.png" />
@@ -24,9 +24,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="SourceEditor2" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
+ <Addin id="SourceEditor2" version="4.1.13"/>
</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.7">
+ version = "4.1.13">
<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.7"/>
- <Addin id="Ide" version="4.1.7"/>
- <Addin id="VersionControl" version="4.1.7"/>
- <Addin id="VersionControl.Subversion" version="4.1.7"/>
+ <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"/>
</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.7">
+ version = "4.1.13">
<Runtime>
<Import assembly="WindowsPlatform.dll"/>
</Runtime>
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
- <Addin id="Ide" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
+ <Addin id="Ide" version="4.1.13"/>
</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.7";
- public const string VersionLabel = "4.1.7";
+ public const string Version = "4.1.13";
+ public const string VersionLabel = "4.1.13";
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.7"
+ version = "4.1.13"
compatVersion = "4.0">
<Dependencies>
- <Addin id="Core" version="4.1.7"/>
+ <Addin id="Core" version="4.1.13"/>
</Dependencies>
<Extension path = "/MonoDevelop/Core/Applications">
Modified: main/tests/TestRunner/TestRunner.csproj
===================================================================
@@ -63,10 +63,6 @@
<Name>Mono.Addins</Name>
<Private>False</Private>
</ProjectReference>
- <ProjectReference Include="..\..\external\guiunit\src\framework\GuiUnit_NET_4_0.csproj">
- <Project>{E13A0A7B-4DE6-43ED-A139-41052D065A9B}</Project>
- <Name>GuiUnit_NET_4_0</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MonoDevelop.TestRunner.addin.xml">
Commit: 3ab7d1728cb4cc2c8f2752ad0092ecc137253d67
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-01 10:04:03 GMT
URL: https://github.com/mono/monodevelop/commit/3ab7d1728cb4cc2c8f2752ad0092ecc137253d67
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]=04348f1f480434d164009b100f07e4e52a4bb944
+DEP_NEEDED_VERSION[0]=bfcc043e8ebdc5d1a2dfec98c37b424b5ef3f2c2
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: fd6e7650629deb48db8e5dfb70fd58d0f8696852
Author: lluis <[email protected]> (slluis)
Date: 2013-11-01 11:23:45 GMT
URL: https://github.com/mono/monodevelop/commit/fd6e7650629deb48db8e5dfb70fd58d0f8696852
Updated references to xwt, debugger-libs, guiunit, md-addins
Changed paths:
M main/external/debugger-libs
M main/external/guiunit
M main/external/xwt
M version-checks
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit 6dc5f2b39855f284e354e7d92a87a0bec554591f
+Subproject commit c960db15c657047c424a578576c6af35ed81005e
Modified: main/external/guiunit
===================================================================
@@ -1 +1 @@
-Subproject commit 8c672f30b6d90e878ebafeb2e518dec35e92c56a
+Subproject commit 1fe9c1e7f5675a1cbdd9d8cc8c9b93df070501b6
Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 1392fb54b08abe4e07b9cc14c4c93fb7e8ef777c
+Subproject commit dfc729dd856d1cceff7853a2648468d4f68d044e
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]=bfcc043e8ebdc5d1a2dfec98c37b424b5ef3f2c2
+DEP_NEEDED_VERSION[0]=05f9100469dd7b229cb23ba335a8bfaa5199a28f
DEP_BRANCH_AND_REMOTE[0]="master origin/master"
# heap-shot
Commit: 4fa222a6b78dbd9d2f1d3ea720ef81832f9f30cf
Author: Therzok <[email protected]> (Therzok)
Date: 2013-11-01 12:40:46 GMT
URL: https://github.com/mono/monodevelop/commit/4fa222a6b78dbd9d2f1d3ea720ef81832f9f30cf
[NUnit TestSuite] Provide better exception data.
Changed paths:
M main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
Modified: main/src/addins/NUnit/Services/NUnitAssemblyTestSuite.cs
===================================================================
@@ -433,7 +433,7 @@ internal UnitTestResult RunUnitTest (UnitTest test, string suiteName, string pat
RuntimeErrorCleanup (testContext, localMonitor.RunningTest, ex);
} else {
testContext.Monitor.ReportRuntimeError (null, ex);
- throw ex;
+ throw;
}
result = UnitTestResult.CreateFailure (ex);
} else {
Commit: 7a168760cb85b81b36607e8dd7f689522305bb70
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-01 16:47:00 GMT
URL: https://github.com/mono/monodevelop/commit/7a168760cb85b81b36607e8dd7f689522305bb70
updated debugger-libs
Changed paths:
M main/external/debugger-libs
Modified: main/external/debugger-libs
===================================================================
@@ -1 +1 @@
-Subproject commit c960db15c657047c424a578576c6af35ed81005e
+Subproject commit dc63536bdeba18737d922bcf4731d3dd2e7a74a6
Commit: ce69a461727725626db176aa9312195a97d1bf88
Author: Jeffrey Stedfast <[email protected]> (jstedfast)
Date: 2013-11-01 17:25:32 GMT
URL: https://github.com/mono/monodevelop/commit/ce69a461727725626db176aa9312195a97d1bf88
[MacPlatform] code cleanup
Changed paths:
M main/src/addins/MacPlatform/MacInterop/Keychain.cs
Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -40,47 +40,9 @@ public static class Keychain
{
const string CoreFoundationLib = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
const string SecurityLib = "/System/Library/Frameworks/Security.framework/Security";
-// const string SystemLib = "/usr/lib/libSystem.dylib";
internal static IntPtr CurrentKeychain = IntPtr.Zero;
-// static IntPtr kCFTypeDictionaryValueCallbacks;
-// static IntPtr kCFTypeDictionaryKeyCallbacks;
-//
-// static IntPtr kSecReturnAttributes;
-// static IntPtr kSecMatchLimitAll;
-// static IntPtr kSecMatchLimit;
-// static IntPtr kSecClass;
-//
-// static IntPtr kCFBooleanFalse;
-// static IntPtr kCFBooleanTrue;
-//
-// static Keychain ()
-// {
-// var lib = dlopen (CoreFoundationLib, 0);
-// try {
-// kCFTypeDictionaryValueCallbacks = dlsym (lib, "kCFTypeDictionaryValueCallBacks");
-// kCFTypeDictionaryKeyCallbacks = dlsym (lib, "kCFTypeDictionaryKeyCallBacks");
-// kCFBooleanFalse = dlsym (lib, "kCFBooleanFalse");
-// kCFBooleanTrue = dlsym (lib, "kCFBooleanTrue");
-// } finally {
-// dlclose (lib);
-// }
-// }
-//
-// #region Dynamic Symbol Loading
-//
-// [DllImport (SystemLib)]
-// static extern IntPtr dlsym (IntPtr handle, string symbol);
-//
-// [DllImport (SystemLib)]
-// static extern IntPtr dlopen (string path, int mode);
-//
-// [DllImport (SystemLib)]
-// static extern int dlclose (IntPtr handle);
-//
-// #endregion
-
[DllImport (CoreFoundationLib, EntryPoint="CFRelease")]
static extern void CFReleaseInternal (IntPtr cfRef);
@@ -90,42 +52,6 @@ static void CFRelease (IntPtr cfRef)
CFReleaseInternal (cfRef);
}
- #region Managing Certificates
-
- [DllImport (SecurityLib)]
- static extern OSStatus SecCertificateAddToKeychain (IntPtr certificate, IntPtr keychain);
-
- [DllImport (SecurityLib)]
- static extern IntPtr SecCertificateCreateWithData (IntPtr allocator, IntPtr data);
-
- [DllImport (SecurityLib)]
- static extern IntPtr SecCertificateCopyData (IntPtr certificate);
-
- [DllImport (SecurityLib)]
- static extern OSStatus SecCertificateCopyCommonName (IntPtr certificate, out IntPtr commonName);
-
- #endregion
-
- #region Managing Identities
-
- [DllImport (SecurityLib)]
- static extern OSStatus SecIdentityCopyCertificate (IntPtr identityRef, out IntPtr certificateRef);
-
- // WARNING: deprecated in Mac OS X 10.7
- [DllImport (SecurityLib)]
- static extern OSStatus SecIdentitySearchCreate (IntPtr keychainOrArray, CssmKeyUse keyUsage, out IntPtr searchRef);
-
- // WARNING: deprecated in Mac OS X 10.7
- [DllImport (SecurityLib)]
- static extern OSStatus SecIdentitySearchCopyNext (IntPtr searchRef, out IntPtr identity);
-
- // Note: SecIdentitySearch* has been replaced with SecItemCopyMatching
-
- //[DllImport (SecurityLib)]
- //OSStatus SecItemCopyMatching (CFDictionaryRef query, CFTypeRef *result);
-
- #endregion
-
#region Getting Information About Security Result Codes
[DllImport (SecurityLib)]
@@ -388,198 +314,6 @@ static string GetError (OSStatus status)
}
}
- [Obsolete ("What purpose does this really serve?")]
- public static unsafe IList<string> GetAllCertificateNames ()
- {
- IntPtr searchRef, itemRef;
- OSStatus status;
-
- status = SecKeychainSearchCreateFromAttributes (CurrentKeychain, SecItemClass.Certificate, null, out searchRef);
- if (status != OSStatus.Ok)
- throw new Exception ("Could not enumerate certificates from the keychain. Error:\n" + GetError (status));
-
- var names = new HashSet<string> ();
-
- while ((status = SecKeychainSearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
- IntPtr commonName;
-
- if (SecCertificateCopyCommonName (itemRef, out commonName) == OSStatus.Ok) {
- names.Add (CFStringGetString (commonName));
- CFRelease (commonName);
- }
-
- CFRelease (itemRef);
- }
-
- if (status != OSStatus.ItemNotFound)
- LoggingService.LogWarning ("Unexpected error retrieving certificates from keychain:\n" + GetError (status));
-
- CFRelease (searchRef);
-
- return names.ToList ();
- }
-
- public static IList<string> GetAllSigningIdentities ()
- {
- IntPtr searchRef, itemRef, certRef, commonName;
- OSStatus status;
-
- status = SecIdentitySearchCreate (CurrentKeychain, CssmKeyUse.Sign, out searchRef);
- if (status != OSStatus.Ok)
- throw new Exception ("Could not enumerate signing identities from the keychain. Error:\n" + GetError (status));
-
- var identities = new HashSet<string> ();
-
- while ((status = SecIdentitySearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
- if (SecIdentityCopyCertificate (itemRef, out certRef) == OSStatus.Ok) {
- if (SecCertificateCopyCommonName (certRef, out commonName) == OSStatus.Ok) {
- string name = CFStringGetString (commonName);
- if (name != null)
- identities.Add (name);
-
- CFRelease (commonName);
- }
-
- CFRelease (certRef);
- }
-
- CFRelease (itemRef);
- }
-
- if (status != OSStatus.ItemNotFound)
- LoggingService.LogWarning ("Unexpected error retrieving identities from keychain:\n" + GetError (status));
-
- CFRelease (searchRef);
-
- return identities.ToList ();
- }
-
- public static IEnumerable<X509Certificate2> FindNamedSigningCertificates (Func<string,bool> nameCheck)
- {
- return GetAllSigningCertificates ().Where (x => {
- var y = GetCertificateCommonName (x);
- return !string.IsNullOrEmpty (y) && nameCheck (y);
- });
- }
-
- public static IList<X509Certificate2> GetAllSigningCertificates ()
- {
- IntPtr searchRef, itemRef, certRef;
- OSStatus status;
-
- status = SecIdentitySearchCreate (CurrentKeychain, CssmKeyUse.Sign, out searchRef);
- if (status != OSStatus.Ok)
- throw new Exception ("Could not enumerate signing certificates from the keychain. Error:\n" + GetError (status));
-
- var certs = new HashSet<X509Certificate2> ();
-
- while ((status = SecIdentitySearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
- if (SecIdentityCopyCertificate (itemRef, out certRef) == OSStatus.Ok) {
- var data = SecCertificateCopyData (certRef);
- var rawData = CFDataGetBytes (data);
-
- if (rawData != null) {
- try {
- certs.Add (new X509Certificate2 (rawData));
- } catch (Exception ex) {
- LoggingService.LogWarning ("Error loading signing certificate from keychain", ex);
- }
- }
-
- CFRelease (certRef);
- }
-
- CFRelease (itemRef);
- }
-
- if (status != OSStatus.ItemNotFound)
- LoggingService.LogWarning ("Unexpected error code retrieving signing certificates from keychain:\n" + GetError (status));
-
- CFRelease (searchRef);
-
- return certs.ToList ();
- }
-
- public static void AddCertificate (X509Certificate2 certificate)
- {
- if (ContainsCertificate (certificate))
- return;
-
- var rawData = certificate.RawData;
- var certData = CFDataCreate (IntPtr.Zero, rawData, rawData.Length);
- var cert = SecCertificateCreateWithData (IntPtr.Zero, certData);
- var status = SecCertificateAddToKeychain (cert, CurrentKeychain);
-
- CFRelease (certData);
- CFRelease (cert);
-
- if (status != OSStatus.Ok)
- throw new Exception ("Cannot add certificate to keychain: " + GetError (status));
- }
-
- public static unsafe bool ContainsCertificate (X509Certificate2 certificate)
- {
- // Note: we don't have to use an alias attribute, it's just that it might be faster to use it (fewer certificates we have to compare raw data for)
- byte[] alias = Encoding.UTF8.GetBytes (GetCertificateCommonName (certificate));
- IntPtr searchRef, itemRef;
- bool found = false;
- byte[] certData;
- OSStatus status;
-
- fixed (byte* aliasPtr = alias) {
- SecKeychainAttribute* attrs = stackalloc SecKeychainAttribute [1];
- int n = 0;
-
- if (alias != null)
- attrs[n++] = new SecKeychainAttribute (SecItemAttr.Alias, (uint) alias.Length, (IntPtr) aliasPtr);
-
- SecKeychainAttributeList attrList = new SecKeychainAttributeList (n, (IntPtr) attrs);
-
- status = SecKeychainSearchCreateFromAttributes (CurrentKeychain, SecItemClass.Certificate, &attrList, out searchRef);
- if (status != OSStatus.Ok)
- throw new Exception ("Could not enumerate certificates from the keychain. Error:\n" + GetError (status));
-
- // we cache certificate.RawData to avoid unneccessary duplication (X509Certificate2.RawData clones the byte[] each time)
- certData = certificate.RawData;
-
- while (!found && (status = SecKeychainSearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
- SecItemClass itemClass = 0;
- IntPtr data = IntPtr.Zero;
- uint length = 0;
-
- status = SecKeychainItemCopyContent (itemRef, ref itemClass, IntPtr.Zero, ref length, ref data);
- if (status == OSStatus.Ok) {
- if (certData.Length == (int) length) {
- byte[] rawData = new byte[(int) length];
-
- Marshal.Copy (data, rawData, 0, (int) length);
-
- found = true;
- for (int i = 0; i < rawData.Length; i++) {
- if (rawData[i] != certData[i]) {
- found = false;
- break;
- }
- }
- }
-
- SecKeychainItemFreeContent (IntPtr.Zero, data);
- }
-
- CFRelease (itemRef);
- }
-
- CFRelease (searchRef);
- }
-
- return found;
- }
-
- public static string GetCertificateCommonName (X509Certificate2 cert)
- {
- return cert.GetNameInfo (X509NameType.SimpleName, false);
- }
-
static SecAuthenticationType GetSecAuthenticationType (string query)
{
if (string.IsNullOrEmpty (query))
@@ -865,175 +599,118 @@ public static string FindInternetPassword (Uri uri)
return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
}
+ }
- enum SecItemClass : uint
- {
- InternetPassword = 1768842612, // 'inet'
- GenericPassword = 1734700656, // 'genp'
- AppleSharePassword = 1634953328, // 'ashp'
- Certificate = 0x80000000 + 0x1000,
- PublicKey = 0x0000000A + 5,
- PrivateKey = 0x0000000A + 6,
- SymmetricKey = 0x0000000A + 7
- }
-
- enum SecItemAttr : int
- {
- CreationDate = 1667522932,
- ModDate = 1835295092,
- Description = 1684370275,
- Comment = 1768123764,
- Creator = 1668445298,
- Type = 1954115685,
- ScriptCode = 1935897200,
- Label = 1818321516,
- Invisible = 1768846953,
- Negative = 1852139361,
- CustomIcon = 1668641641,
- Account = 1633903476,
- Service = 1937138533,
- Generic = 1734700641,
- SecurityDomain = 1935961454,
- Server = 1936881266,
- AuthType = 1635023216,
- Port = 1886351988,
- Path = 1885434984,
- Volume = 1986817381,
- Address = 1633969266,
- Signature = 1936943463,
- Protocol = 1886675820,
- CertificateType = 1668577648,
- CertificateEncoding = 1667591779,
- CrlType = 1668445296,
- CrlEncoding = 1668443747,
- Alias = 1634494835,
- }
-
- enum OSStatus
- {
- Ok = 0,
- ItemNotFound = -25300,
- }
-
- enum SecKeyAttribute
- {
- KeyClass = 0,
- PrintName = 1,
- Alias = 2,
- Permanent = 3,
- Private = 4,
- Modifiable = 5,
- Label = 6,
- ApplicationTag = 7,
- KeyCreator = 8,
- KeyType = 9,
- KeySizeInBits = 10,
- EffectiveKeySize = 11,
- StartDate = 12,
- EndDate = 13,
- Sensitive = 14,
- AlwaysSensitive = 15,
- Extractable = 16,
- NeverExtractable = 17,
- Encrypt = 18,
- Decrypt = 19,
- Derive = 20,
- Sign = 21,
- Verify = 22,
- SignRecover = 23,
- VerifyRecover = 24,
- Wrap = 25,
- Unwrap = 26,
- }
+ enum SecItemClass : uint
+ {
+ InternetPassword = 1768842612, // 'inet'
+ GenericPassword = 1734700656, // 'genp'
+ AppleSharePassword = 1634953328, // 'ashp'
+ Certificate = 0x80000000 + 0x1000,
+ PublicKey = 0x0000000A + 5,
+ PrivateKey = 0x0000000A + 6,
+ SymmetricKey = 0x0000000A + 7
+ }
- enum SecAuthenticationType : int
- {
- NTLM = 1835824238,
- MSN = 1634628461,
- DPA = 1633775716,
- RPA = 1633775730,
- HTTPBasic = 1886680168,
- HTTPDigest = 1685353576,
- HTMLForm = 1836216166,
- Default = 1953261156,
- Any = 0
- }
+ enum SecItemAttr : int
+ {
+ CreationDate = 1667522932,
+ ModDate = 1835295092,
+ Description = 1684370275,
+ Comment = 1768123764,
+ Creator = 1668445298,
+ Type = 1954115685,
+ ScriptCode = 1935897200,
+ Label = 1818321516,
+ Invisible = 1768846953,
+ Negative = 1852139361,
+ CustomIcon = 1668641641,
+ Account = 1633903476,
+ Service = 1937138533,
+ Generic = 1734700641,
+ SecurityDomain = 1935961454,
+ Server = 1936881266,
+ AuthType = 1635023216,
+ Port = 1886351988,
+ Path = 1885434984,
+ Volume = 1986817381,
+ Address = 1633969266,
+ Signature = 1936943463,
+ Protocol = 1886675820,
+ CertificateType = 1668577648,
+ CertificateEncoding = 1667591779,
+ CrlType = 1668445296,
+ CrlEncoding = 1668443747,
+ Alias = 1634494835,
+ }
- enum SecProtocolType : int
- {
- FTP = 1718906912,
- FTPAccount = 1718906977,
- HTTP = 1752462448,
- IRC = 1769104160,
- NNTP = 1852732528,
- POP3 = 1886351411,
- SMTP = 1936553072,
- SOCKS = 1936685088,
- IMAP = 1768776048,
- LDAP = 1818517872,
- AppleTalk = 1635019883,
- AFP = 1634103328,
- Telnet = 1952803950,
- SSH = 1936943136,
- FTPS = 1718906995,
- HTTPProxy = 1752461432,
- HTTPSProxy = 1752462200,
- FTPProxy = 1718907000,
- CIFS = 1667851891,
- SMB = 1936548384,
- RTSP = 1920234352,
- RTSPProxy = 1920234360,
- DAAP = 1684103536,
- EPPC = 1701867619,
- IPP = 1768976416,
- NNTPS = 1853124723,
- LDAPS = 1818521715,
- TelnetS = 1952803955,
- IMAPS = 1768779891,
- IRCS = 1769104243,
- POP3S = 1886351475,
- CVSpserver = 1668707184,
- SVN = 1937141280,
- Any = 0
- }
+ enum OSStatus
+ {
+ Ok = 0,
+ ItemNotFound = -25300,
+ }
- [Flags]
- enum CssmKeyUse : uint
- {
- Any = 0x80000000,
- Encrypt = 0x00000001,
- Decrypt = 0x00000002,
- Sign = 0x00000004,
- Verify = 0x00000008,
- SignRecover = 0x00000010,
- VerifyRecover = 0x00000020,
- Wrap = 0x00000040,
- Unwrap = 0x00000080,
- Derive = 0x00000100
- }
+ enum SecAuthenticationType : int
+ {
+ NTLM = 1835824238,
+ MSN = 1634628461,
+ DPA = 1633775716,
+ RPA = 1633775730,
+ HTTPBasic = 1886680168,
+ HTTPDigest = 1685353576,
+ HTMLForm = 1836216166,
+ Default = 1953261156,
+ Any = 0
+ }
- [Flags]
- enum CssmTPAppleCertStatus : uint
- {
- Expired = 0x00000001,
- NotValidYet = 0x00000002,
- IsInInputCerts = 0x00000004,
- IsInAnchors = 0x00000008,
- IsRoot = 0x00000010,
- IsFromNet = 0x00000020
- }
+ enum SecProtocolType : int
+ {
+ FTP = 1718906912,
+ FTPAccount = 1718906977,
+ HTTP = 1752462448,
+ IRC = 1769104160,
+ NNTP = 1852732528,
+ POP3 = 1886351411,
+ SMTP = 1936553072,
+ SOCKS = 1936685088,
+ IMAP = 1768776048,
+ LDAP = 1818517872,
+ AppleTalk = 1635019883,
+ AFP = 1634103328,
+ Telnet = 1952803950,
+ SSH = 1936943136,
+ FTPS = 1718906995,
+ HTTPProxy = 1752461432,
+ HTTPSProxy = 1752462200,
+ FTPProxy = 1718907000,
+ CIFS = 1667851891,
+ SMB = 1936548384,
+ RTSP = 1920234352,
+ RTSPProxy = 1920234360,
+ DAAP = 1684103536,
+ EPPC = 1701867619,
+ IPP = 1768976416,
+ NNTPS = 1853124723,
+ LDAPS = 1818521715,
+ TelnetS = 1952803955,
+ IMAPS = 1768779891,
+ IRCS = 1769104243,
+ POP3S = 1886351475,
+ CVSpserver = 1668707184,
+ SVN = 1937141280,
+ Any = 0
+ }
- enum CssmDbAttributeFormat : int
- {
- String = 0,
- Int32 = 1,
- UInt32 = 2,
- BigNum = 3,
- Real = 4,
- DateTime = 5,
- Blob = 6,
- MultiUInt32 = 7,
- Complex = 8
- }
+ enum CssmDbAttributeFormat : int
+ {
+ String = 0,
+ Int32 = 1,
+ UInt32 = 2,
+ BigNum = 3,
+ Real = 4,
+ DateTime = 5,
+ Blob = 6,
+ MultiUInt32 = 7,
+ Complex = 8
}
}
Commit: 6e74075d932de3e1003e025ba651114c9ffaed59
Author: Lluis Sanchez <[email protected]> (slluis)
Date: 2013-11-01 17:27:10 GMT
URL: https://github.com/mono/monodevelop/commit/6e74075d932de3e1003e025ba651114c9ffaed59
Merge remote-tracking branch 'origin/master' into retina
Conflicts:
main/external/monomac
version-checks
Changed paths:
M .gitattributes
M .gitmodules
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/Main.sln
M main/configure.in
M main/external/debugger-libs
M main/external/guiunit
M main/external/ngit
M main/external/nrefactory
M main/external/xwt
M main/src/addins/CBinding/CBinding.addin.xml
M main/src/addins/CSharpBinding/Autotools/CSharpAutotoolsSetup.cs
M main/src/addins/CSharpBinding/CSharpBinding.addin.xml
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpCompletionTextEditorExtension.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpCompilerParameters.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CodeGenerationPanel.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/LanguageItemTooltipProvider.cs
M main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
M main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Project.CodeGenerationPanelWidget.cs
M main/src/addins/CSharpBinding/gtk-gui/gui.stetic
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/ILAsmBinding/AddinInfo.cs
M main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs
M main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs
M main/src/addins/ILAsmBinding/ILAsmLanguageBinding.cs
M main/src/add
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.