Merge branch 'master' into vNext

19 files changed, 59 insertions, 49 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
index 836686d483..8f74d3ce58 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpTextPasteHandler.cs
@@ -65,7 +65,7 @@ namespace MonoDevelop.CSharp.Formatting
 					indent.DocumentContext.GetFormattingPolicy (),
 					indent.DocumentContext.Project.Policies.Get<Ide.Gui.Content.TextStylePolicy> (),
 					indent.Editor.GetTextBetween (lineStartOffset, insertionOffset + insertedChars),
-					lineStartOffset,
+					0,
 					formatCharsCount
 				);
 				indent.Editor.ReplaceText (lineStartOffset, formatCharsCount, newText);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
index 83ecac0135..8a956915ee 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Project/CSharpResourceIdBuilder.cs
@@ -42,7 +42,7 @@ namespace MonoDevelop.CSharp.Project
 	{
 		public static string GetDefaultResourceId (ProjectFile pf)
 		{
-			if (String.IsNullOrEmpty (pf.DependsOn) || !File.Exists (pf.DependsOn) || Path.GetExtension (pf.DependsOn).ToLower () != ".cs")
+			if (String.IsNullOrEmpty (pf.DependsOn) || !File.Exists (pf.DependsOn) || !string.Equals (Path.GetExtension (pf.DependsOn), ".cs", StringComparison.OrdinalIgnoreCase))
 				return null;
 
 			string ns = null;
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
index e26077f81e..2b8c299ad6 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
@@ -243,7 +243,7 @@ namespace MonoDevelop.CSharp
 			if (compilerParameters.NoStdLib) 
 				sb.AppendLine ("-nostdlib");
 			
-			if (!string.IsNullOrEmpty (compilerParameters.PlatformTarget) && compilerParameters.PlatformTarget.ToLower () != "anycpu") {
+			if (!string.IsNullOrEmpty (compilerParameters.PlatformTarget) && !string.Equals (compilerParameters.PlatformTarget, "anycpu", StringComparison.OrdinalIgnoreCase)) {
 				//HACK: to ignore the platform flag for Mono <= 2.4, because gmcs didn't support it
 				if (runtime.RuntimeId == "Mono" && runtime.AssemblyContext.GetAssemblyLocation ("Mono.Debugger.Soft", null) == null) {
 					LoggingService.LogWarning ("Mono runtime '" + runtime.DisplayName + 
diff --git a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
index 3b94b87407..752b45d5c1 100644
--- a/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
+++ b/main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs
@@ -244,7 +244,7 @@ namespace MonoDevelop.MacIntegration
 
 		static bool CanBeOpenedInAssemblyBrowser (FilePath filename)
 		{
-			return filename.Extension.ToLower () == ".exe" || filename.Extension.ToLower () == ".dll";
+			return string.Equals (filename.Extension, ".exe", StringComparison.OrdinalIgnoreCase) || string.Equals (filename.Extension, ".dll", StringComparison.OrdinalIgnoreCase);
 		}
 
 		static void CenterAccessoryView (MDBox box)
diff --git a/main/src/addins/MacPlatform/MacInterop/Keychain.cs b/main/src/addins/MacPlatform/MacInterop/Keychain.cs
index 42afd88a92..c8d10ecf50 100644
--- a/main/src/addins/MacPlatform/MacInterop/Keychain.cs
+++ b/main/src/addins/MacPlatform/MacInterop/Keychain.cs
@@ -313,14 +313,14 @@ namespace MonoDevelop.MacInterop
 
 			string auth = "default";
 			foreach (var pair in query.Substring (1).Split (new char[] { '&' })) {
-				var kvp = pair.ToLowerInvariant ().Split (new char[] { '=' });
-				if (kvp[0] == "auth" && kvp.Length == 2) {
-					auth = kvp[1];
+				var kvp = pair.Split (new char[] { '=' });
+				if (string.Equals (kvp[0], "auth", StringComparison.InvariantCultureIgnoreCase) && kvp.Length == 2) {
+					auth = kvp[1].ToLowerInvariant ();
 					break;
 				}
 			}
 
-			switch (auth.ToLowerInvariant ()) {
+			switch (auth) {
 			case "ntlm": return SecAuthenticationType.NTLM;
 			case "msn": return SecAuthenticationType.MSN;
 			case "dpa": return SecAuthenticationType.DPA;
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index 04449461bc..be2b957f11 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -617,7 +617,8 @@ namespace MonoDevelop.AssemblyBrowser
 				return true;
 			return false;
 		}
-		
+
+		bool expandedMember = true;
 		ITreeNavigator SearchMember (ITreeNavigator nav, string helpUrl, bool expandNode = true)
 		{
 			if (nav == null)
@@ -627,13 +628,11 @@ namespace MonoDevelop.AssemblyBrowser
 				if (IsMatch (nav, helpUrl, searchType)) {
 					inspectEditor.ClearSelection ();
 					nav.ExpandToNode ();
-					if (expandNode) {
-						nav.Selected = nav.Expanded = true;
-						nav.ScrollToNode ();
-					} else {
-						nav.Selected = true;
-						nav.ScrollToNode ();
-					}
+					if (expandNode)
+						nav.Expanded = true;
+					nav.Selected = true;
+					nav.ScrollToNode ();
+					expandedMember = true;
 					return nav;
 				}
 				if (!SkipChildren (nav, helpUrl, searchType) && nav.HasChildren ()) {
@@ -791,7 +790,7 @@ namespace MonoDevelop.AssemblyBrowser
 			var publicOnly = PublicApiOnly;
 			BackgroundWorker worker = sender as BackgroundWorker;
 			try {
-				string pattern = e.Argument.ToString ().ToUpper ();
+				string pattern = e.Argument.ToString ();
 				int types = 0, curType = 0;
 				foreach (var unit in this.definitions) {
 					types += unit.UnresolvedAssembly.TopLevelTypeDefinitions.Count ();
@@ -812,7 +811,7 @@ namespace MonoDevelop.AssemblyBrowser
 									return;
 								if (!member.IsPublic && publicOnly)
 									continue;
-								if (member.Name.ToUpper ().Contains (pattern)) {
+								if (member.Name.IndexOf (pattern, StringComparison.OrdinalIgnoreCase) != -1) {
 									members.Add (member);
 								}
 							}
@@ -939,7 +938,7 @@ namespace MonoDevelop.AssemblyBrowser
 							if (!type.IsPublic && publicOnly)
 								continue;
 							var parent = type.FullName;
-							if (parent.ToUpper ().IndexOf (pattern, StringComparison.Ordinal) >= 0)
+							if (parent.IndexOf (pattern, StringComparison.OrdinalIgnoreCase) >= 0)
 								typeList.Add (Tuple.Create ((IUnresolvedEntity)type, type.Namespace));
 							
 							foreach (var member in type.Members) {
@@ -947,7 +946,7 @@ namespace MonoDevelop.AssemblyBrowser
 									return;
 								if (!member.IsPublic && publicOnly)
 									continue;
-								if (member.Name.ToUpper ().Contains (pattern)) {
+								if (member.Name.IndexOf (pattern, StringComparison.OrdinalIgnoreCase) != -1) {
 									typeList.Add (Tuple.Create ((IUnresolvedEntity)member, parent));
 								}
 							}
@@ -1447,6 +1446,11 @@ namespace MonoDevelop.AssemblyBrowser
 				if (nav == null)
 					return;
 
+				if (expandedMember) {
+					expandedMember = false;
+					return;
+				}
+
 				do {
 					if (nav.DataItem == cu || (nav.DataItem as AssemblyLoader)?.Assembly == cu) {
 						nav.ExpandToNode ();
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
index 645a99490b..996ce13e1f 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyLoader.cs
@@ -89,6 +89,7 @@ namespace MonoDevelop.AssemblyBrowser
 			loader = new CecilLoader (true);
 			loader.InterningProvider = new FastNonInterningProvider ();
 			loader.IncludeInternalMembers = true;
+			loader.LazyLoad = true;
 
 			assemblyLoaderTask = Task.Run ( () => {
 				try {
@@ -179,7 +180,7 @@ namespace MonoDevelop.AssemblyBrowser
 				return exe;
 
 			foreach (var asm in Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblies ()) {
-				if (asm.Name.ToLowerInvariant () == fullAssemblyName.ToLowerInvariant ())
+				if (string.Equals (asm.Name, fullAssemblyName, StringComparison.OrdinalIgnoreCase))
 					return asm.Location;
 			}
 
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
index 80c83a68c0..ffda5ad636 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Tests/EvaluationTests.cs
@@ -1048,6 +1048,10 @@ namespace MonoDevelop.Debugger.Tests
 			if (soft != null && soft.ProtocolVersion < new Version (2, 31))
 				Assert.Ignore ("A newer version of the Mono runtime is required.");
 
+			val = Eval ("(int)19.7");
+			Assert.AreEqual ("19", val.Value);
+			Assert.AreEqual ("int", val.TypeName);
+
 			val = Eval ("(byte)n");
 			Assert.AreEqual ("32", val.Value);
 			Assert.AreEqual ("byte", val.TypeName);
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 898fac8501..beade3e35b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -438,8 +438,6 @@ namespace MonoDevelop.Debugger
 			session.OutputWriter = null;
 			session.LogWriter = null;
 
-			sessionManager.Dispose ();
-
 			Runtime.RunInMainThread (delegate {
 				if (cleaningCurrentSession)
 					HideExceptionCaughtDialog ();
@@ -455,8 +453,9 @@ namespace MonoDevelop.Debugger
 				NotifyCallStackChanged ();
 				NotifyCurrentFrameChanged ();
 				NotifyLocationChanged ();
+			}).ContinueWith ((t) => {
+				sessionManager.Dispose ();
 			});
-
 		}
 
 		static string oldLayout;
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
index 46924c50e8..de0f8557f1 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs
@@ -752,9 +752,7 @@ namespace MonoDevelop.Gettext
 			if (RegexSearch)
 				return regex.IsMatch (text);
 		
-			if (!IsCaseSensitive)
-				text = text.ToUpper ();
-			int idx = text.IndexOf (filter);
+			int idx = text.IndexOf (filter, IsCaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase);
 			if (idx >= 0) {
 				if (IsWholeWordOnly) {
 					return (idx == 0 || char.IsWhiteSpace (text[idx - 1])) &&
@@ -804,8 +802,6 @@ namespace MonoDevelop.Gettext
 		void UpdateFromCatalog ()
 		{
 			filter = this.searchEntryFilter.Entry.Text;
-			if (!IsCaseSensitive && filter != null)
-				filter = filter.ToUpper ();
 			if (RegexSearch) {
 				try {
 					RegexOptions options = RegexOptions.Compiled;
@@ -1142,9 +1138,11 @@ namespace MonoDevelop.Gettext
 			}
 			
 			if (!CompareTasks (tasks, currentTasks)) {
-				ClearTasks ();
-				currentTasks = tasks;
-				TaskService.Errors.AddRange (tasks);
+				Runtime.RunInMainThread (() => {
+					ClearTasks ();
+					currentTasks = tasks;
+					TaskService.Errors.AddRange (tasks);
+				});
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs
index 55cd1613cf..a93f10b208 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/Catalog.cs
@@ -395,7 +395,7 @@ namespace MonoDevelop.Gettext
 		{
 			foreach (EncodingInfo info in Encoding.GetEncodings ()) {
 				try {
-					if (info.Name.ToLower () == charset.ToLower ())
+					if (string.Equals (info.Name, charset, StringComparison.OrdinalIgnoreCase))
 						return true;
 				} catch (Exception) {
 					// info.Name may fail.
@@ -429,7 +429,7 @@ namespace MonoDevelop.Gettext
 		{
 			foreach (EncodingInfo info in Encoding.GetEncodings ()) {
 				try {
-					if (info.Name.ToLower () == charset.ToLower ())
+					if (string.Equals (info.Name, charset, StringComparison.OrdinalIgnoreCase))
 						return info.GetEncoding ();
 				} catch (Exception) {
 					// info.Name may fail.
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
index 1a9d592dfb..9595cfed2c 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ObjectsDocument.cs
@@ -76,7 +76,7 @@ namespace MonoDevelop.GtkCore
 		SyncState AttrSyncState {
 			get {
 				if (DocumentElement.HasAttribute ("attr-sync")) {
-					if (DocumentElement.GetAttribute ("attr-sync").ToLower () == "off")
+					if (string.Equals (DocumentElement.GetAttribute ("attr-sync"), "off", StringComparison.OrdinalIgnoreCase))
 						return SyncState.Off;
 					else
 						return SyncState.On;
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
index b47aaf4ad0..5a21201fbe 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
@@ -262,7 +262,7 @@ namespace MonoDevelop.AnalysisCore.Gui
 							var effect = currentResult.InspectionMark == IssueMarker.DottedLine ? TextSegmentMarkerEffect.DottedLine : TextSegmentMarkerEffect.WavedLine;
 							var marker = TextMarkerFactory.CreateGenericTextSegmentMarker (editor, effect, TextSegment.FromBounds (start, end));
 							marker.Color = GetColor (editor, currentResult);
-							marker.IsVisible = currentResult.Underline;
+							marker.IsVisible = currentResult.Underline && currentResult.Level != DiagnosticSeverity.Hidden;
 							marker.Tag = currentResult;
 							editor.AddMarker (marker);
 							ext.markers.Enqueue (marker);
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
index bc1fce2131..933e9b068e 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
@@ -213,7 +213,7 @@ namespace MonoDevelop.Refactoring.Rename
 					var newName = properties.NewName;
 					if (string.IsNullOrEmpty (oldFileName) || string.IsNullOrEmpty (newName))
 						continue;
-					if (oldFileName.ToUpper () == newName.ToUpper () || oldFileName.ToUpper ().EndsWith ("." + newName.ToUpper (), StringComparison.Ordinal))
+					if (string.Equals (oldFileName, newName, StringComparison.OrdinalIgnoreCase) || oldFileName.EndsWith ("." + newName, StringComparison.OrdinalIgnoreCase))
 						continue;
 					int idx = oldFileName.IndexOf (type.Name, StringComparison.Ordinal);
 					if (idx >= 0) {
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs
index c87d4bc931..8ef8f91b91 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor.PopupWindow/ListWindow.cs
@@ -174,8 +174,8 @@ namespace Mono.TextEditor.PopupWindow
 		public bool IsUniqueMatch {
 			get {
 				int pos = list.Selection + 1;
-				if (provider.Count > pos && provider.GetText (pos).ToLower ().StartsWith (PartialWord.ToLower ())
-				    || !(provider.GetText (list.Selection).ToLower ().StartsWith (PartialWord.ToLower ())))
+				if (provider.Count > pos && provider.GetText (pos).StartsWith (PartialWord, StringComparison.OrdinalIgnoreCase)
+				    || !(provider.GetText (list.Selection).StartsWith (PartialWord, StringComparison.OrdinalIgnoreCase)))
 					return false;
 				
 				return true;	
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
index cf0638888a..77e45ccd2f 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
@@ -103,7 +103,8 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 					yield break;
 				foreach (var tasks in providerTasks.Values) {
 					foreach (var task in tasks) {
-						yield return task;
+						if (task.Severity != DiagnosticSeverity.Hidden)
+							yield return task;
 					}
 				}
 			}
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs
index 12248158f1..cc3fb70364 100644
--- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/ExternalTestRunner.cs
@@ -190,16 +190,18 @@ namespace MonoDevelop.UnitTesting.NUnit.External
 			t.Status = TestStatus.Running;
 		}
 
+		static readonly string FailedMessage = GettextCatalog.GetString ("Test failed");
+		static readonly string IgnoredMessage = GettextCatalog.GetString ("Test ignored");
+		static readonly string SuccededMessage = GettextCatalog.GetString ("Test successful") + "\n\n";
 		void ProcessResult (UnitTestResult res)
 		{
 			if (string.IsNullOrEmpty (res.Message)) {
 				if (res.IsFailure)
-					res.Message = GettextCatalog.GetString ("Test failed");
+					res.Message = SuccededMessage;
 				else if (res.IsNotRun)
-					res.Message = GettextCatalog.GetString ("Test ignored");
+					res.Message = IgnoredMessage;
 				else {
-					res.Message = GettextCatalog.GetString ("Test successful") + "\n\n";
-					res.Message += GettextCatalog.GetString ("Execution time: {0:0.00}ms", res.Time.TotalMilliseconds);
+					res.Message = SuccededMessage + GettextCatalog.GetString ("Execution time: {0:0.00}ms", res.Time.TotalMilliseconds);
 				}
 			}
 		}
diff --git a/main/src/addins/VBNetBinding/VBCodeGenerator.cs b/main/src/addins/VBNetBinding/VBCodeGenerator.cs
index 6778c18a7e..bdde649c0a 100644
--- a/main/src/addins/VBNetBinding/VBCodeGenerator.cs
+++ b/main/src/addins/VBNetBinding/VBCodeGenerator.cs
@@ -1521,7 +1521,7 @@ namespace MonoDevelop.VBNetBinding
 		protected override string CreateEscapedIdentifier (string value)
 		{
 			for (int x = 0; x < Keywords.Length; x++)
-				if (value.ToLower().Equals (Keywords[x].ToLower()))
+				if (string.Equals (value, Keywords[x], StringComparison.OrdinalIgnoreCase))
 					return "[" + value + "]";
 			return value;
 		}
@@ -1529,7 +1529,7 @@ namespace MonoDevelop.VBNetBinding
 		protected override string CreateValidIdentifier (string value)
 		{
 			for (int x = 0; x < Keywords.Length; x++)
-				if (value.ToLower().Equals (Keywords[x].ToLower()))
+				if (string.Equals (value, Keywords [x], StringComparison.OrdinalIgnoreCase))
 					return "_" + value;
 			return value;
 		}
@@ -1615,7 +1615,7 @@ namespace MonoDevelop.VBNetBinding
 		protected override bool IsValidIdentifier (string identifier)
 		{
 			for (int x = 0; x < Keywords.Length; x++)
-				if (identifier.ToLower().Equals (Keywords[x].ToLower()))
+				if (string.Equals (identifier, Keywords [x], StringComparison.OrdinalIgnoreCase))
 					return false;
 			return true;
 		}
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
index 232b68ddda..a62b185dd6 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
@@ -550,8 +550,9 @@ namespace MonoDevelop.Platform
 				try {
 					SHOpenFolderAndSelectItems (dir, (uint)files.Length, files, 0);
 				} finally {
-					ILFree (dir);
-					files.ToList ().ForEach (ILFree);
+					ILFree (dir);

+					foreach (var file in files)

+						ILFree (file);
 				}
 			}
 		}