Merge branch 'master' of github.com:icsharpcode/SharpDevelop

Author: PeterForstmeier

README.md

@@ -29,7 +29,7 @@ If you want to contribute see ["Joining the team"](https://github.com/icsharpcod
  - [Microsoft Build Tools 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
  - [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22)
  - [.NET 4.5 SDK](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx) (part of Windows SDK 8.0)
- - [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B) (?? not sure if this still is necessary...)
+ - [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B)
  - [Windows SDK 7.0](http://www.microsoft.com/en-us/download/details.aspx?id=3138) (optional; C++ compiler needed for profiler)
  - [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595)
  - If you have cloned the SD git repository: git must be available on your PATH

doc/Dependencies.html

@@ -10,7 +10,7 @@
 
 		<ul>
 			<li>
-				<a href="http://www.microsoft.com/en-us/download/details.aspx?id=40772">Microsoft .NET Framework 4.5.1 Developer Pack</a> for .NET 4.5 code completion documentation
+				<a href="http://www.microsoft.com/en-us/download/details.aspx?id=42637">Microsoft .NET Framework 4.5.2 Developer Pack</a> for .NET 4.5 code completion documentation
 			</li>
 			<li>
 				<a href="http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B&amp;displaylang=en">Microsoft Windows SDK for Windows 7 and .NET Framework 4</a> (strongly recommended!)
@@ -47,6 +47,10 @@
 				<th>Target platform</th>
 				<th>Reference Assemblies</th>
 			<tr>
+			<tr>
+				<td>.NET Framework 4.5.2</td>
+				<td><a href="http://www.microsoft.com/en-us/download/details.aspx?id=42637">Microsoft .NET Framework 4.5.2 Developer Pack</a></td>
+			</tr>
 			<tr>
 				<td>.NET Framework 4.5.1</td>
 				<td><a href="http://www.microsoft.com/en-us/download/details.aspx?id=40772">Microsoft .NET Framework 4.5.1 Developer Pack</a></td>

src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs

@@ -78,7 +78,7 @@ public Value Result {
 						case EvalState.Evaluating:            throw new GetValueException("Evaluating...");
 						case EvalState.EvaluatedSuccessfully: return result;
 						case EvalState.EvaluatedException:    return result;
-						case EvalState.EvaluatedNoResult:     throw new DebuggerException("Evaluation did not return any value.");
+						case EvalState.EvaluatedNoResult: 	  throw new GetValueException("no result");
 						case EvalState.EvaluatedTimeOut:      throw new GetValueException("Timeout");
 						default: throw new DebuggerException("Unknown state");
 				}

src/AddIns/Debugger/Debugger.Core/Eval.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using System.Runtime.InteropServices;
 using ICSharpCode.NRefactory.TypeSystem;
 using Debugger.Interop.CorDebug;
 using Debugger.Interop.CorSym;
@@ -480,17 +481,26 @@ internal void AsyncContinue(DebuggeeStateAction action, Thread threadToRun = nul
 		{
 			AssertPaused();
 
-			if (threadToRun != null) {
-				corProcess.SetAllThreadsDebugState(CorDebugThreadState.THREAD_SUSPEND, null);
-				threadToRun.CorThread.SetDebugState(CorDebugThreadState.THREAD_RUN);
-			} else {
-				corProcess.SetAllThreadsDebugState(CorDebugThreadState.THREAD_RUN, null);
-			}
-			
-			NotifyResumed(action);
-			corProcess.Continue(0);
-			// this.TraceMessage("Continue");
+			try {
+				if (threadToRun != null) {
+					corProcess.SetAllThreadsDebugState(CorDebugThreadState.THREAD_SUSPEND, null);
+					threadToRun.CorThread.SetDebugState(CorDebugThreadState.THREAD_RUN);
+				} else {
+					corProcess.SetAllThreadsDebugState(CorDebugThreadState.THREAD_RUN, null);
+				}
 
+				NotifyResumed(action);
+				corProcess.Continue(0);
+				// this.TraceMessage("Continue");
+			} catch (COMException ex) {
+				if (ex.HResult == unchecked((int)0x80131301)) {
+					// Process was terminated. (Exception from HRESULT: 0x80131301)
+					// This occurs if a process is killed (e.g. console window of console application closed)
+					// while the application is doing something involving debugger callbacks (Debug.WriteLine calls, or throwing+handling exceptions).
+					
+					// I think we can safely ignore this error.
+				}
+			}
 			if (action == DebuggeeStateAction.Clear) {
 				OnResumed();
 			}

src/AddIns/Debugger/Debugger.Core/Process.cs

@@ -129,7 +129,7 @@ namespace Debugger.Tests {
 
 	public partial class DebuggerTests
 	{
-		[NUnit.Framework.Test]
+		[NUnit.Framework.Test, NUnit.Framework.Ignore("Broken on .NET 4.5.2 due to #472")]
 		public void ControlFlow_Stepping()
 		{
 			StartTest();

src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs

@@ -115,7 +115,10 @@ public Editor()
 			selection = new SelectionManager(ref buffer);
 			undoStack = new UndoManager();
 			insertmode = true;
-			underscorewidth = MeasureStringWidth(this.CreateGraphics(), "_", Settings.DataFont);
+			using (var g = this.CreateGraphics()) {
+				VScrollBar.Width = (int)(VScrollBar.Width * (g.DpiX / 96f));
+				underscorewidth = MeasureStringWidth(g, "_", Settings.DataFont);
+			}
 			underscorewidth3 = underscorewidth * 3;
 			fontheight = GetFontHeight(Settings.DataFont);
 			selregion = new Rectangle[] {};

src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs

@@ -96,7 +96,7 @@ public IEnumerable<ILLocalVariable> GetLocalVariables(IMethod method)
 			var file = GetSymbols(method);
 
 			if (file == null || !file.DebugSymbols.ContainsKey(id))
-				return null;
+				return Enumerable.Empty<ILLocalVariable>();
 
 			var symbols = file.DebugSymbols[id];
 

src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs

@@ -64,6 +64,7 @@ public static void ShowSingleInstance(SearchAndReplaceMode searchAndReplaceMode)
 
 		public SearchAndReplaceDialog(SearchAndReplaceMode searchAndReplaceMode)
 		{
+			SuspendLayout();
 			this.FormBorderStyle = FormBorderStyle.FixedToolWindow;
 			this.ShowInTaskbar   = false;
 			this.TopMost         = false;
@@ -94,6 +95,10 @@ public SearchAndReplaceDialog(SearchAndReplaceMode searchAndReplaceMode)
 			Controls.Add(toolStrip);
 			RightToLeftConverter.ConvertRecursive(this);
 
+			this.AutoScaleMode = AutoScaleMode.Dpi;
+			this.AutoScaleDimensions = new SizeF(96, 96);
+			ResumeLayout();
+			
 			SetSearchAndReplaceMode();
 			FormLocationHelper.Apply(this, "ICSharpCode.SharpDevelop.Gui.SearchAndReplaceDialog.Location", false);
 
@@ -144,12 +149,16 @@ void EnableSearchMode(bool enable)
 
 		void SetSearchAndReplaceMode()
 		{
+			SuspendLayout();
 			searchAndReplacePanel.SearchAndReplaceMode = searchButton.Checked ? SearchAndReplaceMode.Search : SearchAndReplaceMode.Replace;
+			this.AutoScaleMode = AutoScaleMode.Dpi;
+			this.AutoScaleDimensions = new SizeF(96, 96);
 			if (searchButton.Checked) {
 				this.ClientSize      = new Size(430, 335);
 			} else {
 				this.ClientSize      = new Size(430, 385);
 			}
+			ResumeLayout();
 		}
 
 		/// <summary>