From 3bbbf0b73213b1c8a11302631cbe670cf72f00e4 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sun, 4 May 2014 18:07:35 +0200
Subject: [PATCH 01/17] Windows SDK 7.1 is still necessary

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92de3a1a2a..82ab3df9c8 100644
--- a/README.md
+++ b/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

From 14464bd8b49a98375284d6d5c62cf92a86561e01 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Tue, 6 May 2014 23:35:36 +0200
Subject: [PATCH 02/17] Fix #466: Add support for targeting .NET 4.5.2

---
 doc/Dependencies.html                         |   6 +-
 .../Project/ICSharpCode.SharpDevelop.addin    |   1 +
 .../TargetFrameworks/TargetFramework.cs       | 160 +-----------------
 src/Main/Base/Project/Util/DotnetDetection.cs |   6 +
 src/Main/Base/Project/Util/Versions.cs        |   1 +
 .../Parser/AssemblyParserService.cs           |   3 +-
 6 files changed, 16 insertions(+), 161 deletions(-)

diff --git a/doc/Dependencies.html b/doc/Dependencies.html
index 651804098e..6a6fda7484 100644
--- a/doc/Dependencies.html
+++ b/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>
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index d618fc53c8..ce7d1a6f95 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -2451,5 +2451,6 @@
 		<Static class="ICSharpCode.SharpDevelop.Project.TargetFramework" member="Net40Client" />
 		<Static class="ICSharpCode.SharpDevelop.Project.TargetFramework" member="Net45" />
 		<Static class="ICSharpCode.SharpDevelop.Project.TargetFramework" member="Net451" />
+		<Static class="ICSharpCode.SharpDevelop.Project.TargetFramework" member="Net452" />
 	</Path>
 </AddIn>
diff --git a/src/Main/Base/Project/Project/TargetFrameworks/TargetFramework.cs b/src/Main/Base/Project/Project/TargetFrameworks/TargetFramework.cs
index 04ee558b53..33db017853 100644
--- a/src/Main/Base/Project/Project/TargetFrameworks/TargetFramework.cs
+++ b/src/Main/Base/Project/Project/TargetFrameworks/TargetFramework.cs
@@ -37,6 +37,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		public static readonly TargetFramework Net40Client = new DotNet4xClient(Versions.V4_0, RedistLists.Net40Client, DotnetDetection.IsDotnet40Installed);
 		public static readonly TargetFramework Net45 = new DotNet4x(Versions.V4_5, RedistLists.Net45, DotnetDetection.IsDotnet45Installed);
 		public static readonly TargetFramework Net451 = new DotNet4x(Versions.V4_5_1, RedistLists.Net45, DotnetDetection.IsDotnet451Installed);
+		public static readonly TargetFramework Net452 = new DotNet4x(Versions.V4_5_2, RedistLists.Net45, DotnetDetection.IsDotnet452Installed);
 		
 		/// <summary>
 		/// Retrieves a target framework by a 'name'.
@@ -230,163 +231,4 @@ namespace ICSharpCode.SharpDevelop.Project
 			return DisplayName;
 		}
 	}
-	
-	/*
-	public class TargetFramework
-	{
-		public readonly static TargetFramework Net20 = new TargetFramework("v2.0", ".NET Framework 2.0") {
-			SupportedRuntimeVersion = "v2.0.50727",
-			MinimumMSBuildVersion = new Version(2, 0),
-			// .NET 2.0/3.0/3.5 can only be used if .NET 3.5 SP1 is installed
-			IsAvailable = DotnetDetection.IsDotnet35SP1Installed
-		};
-		public readonly static TargetFramework Net30 = new TargetFramework("v3.0", ".NET Framework 3.0") {
-			SupportedRuntimeVersion = "v2.0.50727",
-			BasedOn = Net20,
-			MinimumMSBuildVersion = new Version(3, 5)
-		};
-		public readonly static TargetFramework Net35 = new TargetFramework("v3.5", ".NET Framework 3.5") {
-			SupportedRuntimeVersion = "v2.0.50727",
-			BasedOn = Net30,
-			MinimumMSBuildVersion = new Version(3, 5)
-		};
-		public readonly static TargetFramework Net35Client = new ClientProfileTargetFramework(Net35) {
-			RequiresAppConfigEntry = true
-		};
-		public readonly static TargetFramework Net40 = new TargetFramework("v4.0", ".NET Framework 4.0") {
-			BasedOn = Net35,
-			MinimumMSBuildVersion = new Version(4, 0),
-			SupportedSku = ".NETFramework,Version=v4.0",
-			RequiresAppConfigEntry = true,
-			IsAvailable = DotnetDetection.IsDotnet40Installed
-		};
-		public readonly static TargetFramework Net40Client = new ClientProfileTargetFramework(Net40) {
-			BasedOn = Net35Client
-		};
-		public readonly static TargetFramework Net45 = new TargetFramework("v4.5", ".NET Framework 4.5") {
-			BasedOn = Net40,
-			MinimumMSBuildVersion = new Version(4, 0),
-			SupportedRuntimeVersion = "v4.0",
-			SupportedSku = ".NETFramework,Version=v4.5",
-			RequiresAppConfigEntry = true,
-			IsAvailable = DotnetDetection.IsDotnet45Installed
-		};
-		public readonly static TargetFramework Net451 = new TargetFramework("v4.5.1", ".NET Framework 4.5.1") {
-			BasedOn = Net45,
-			MinimumMSBuildVersion = new Version(4, 0),
-			SupportedRuntimeVersion = "v4.0",
-			SupportedSku = ".NETFramework,Version=v4.5.1",
-			RequiresAppConfigEntry = true,
-			IsAvailable = DotnetDetection.IsDotnet451Installed
-		};
-		
-		public readonly static TargetFramework[] TargetFrameworks = {
-			Net451, Net45, Net40, Net40Client, Net35, Net35Client, Net30, Net20
-		};
-		
-		public readonly static TargetFramework DefaultTargetFramework = Net40Client;
-		
-		public static TargetFramework GetByName(string name)
-		{
-			foreach (TargetFramework tf in TargetFrameworks) {
-				if (tf.Name == name)
-					return tf;
-			}
-			throw new ArgumentException("No target framework '" + name + "' exists");
-		}
-		
-		string name, displayName;
-		
-		public TargetFramework(string name, string displayName)
-		{
-			this.name = name;
-			this.displayName = displayName;
-			this.SupportedRuntimeVersion = name;
-			this.IsAvailable = delegate {
-				if (this.BasedOn != null)
-					return this.BasedOn.IsAvailable();
-				else
-					return true;
-			};
-		}
-		
-		public string Name {
-			get { return name; }
-		}
-		
-		public string DisplayName {
-			get { return displayName; }
-		}
-		
-		/// <summary>
-		/// Function that determines if this target framework is available.
-		/// </summary>
-		public Func<bool> IsAvailable { get; set; }
-		
-		/// <summary>
-		/// Supported runtime version string for app.config
-		/// </summary>
-		public string SupportedRuntimeVersion { get; set; }
-		
-		/// <summary>
-		/// Supported SKU string for app.config.
-		/// </summary>
-		public string SupportedSku { get; set; }
-		
-		/// <summary>
-		/// Specifies whether this target framework requires an explicit app.config entry.
-		/// </summary>
-		public bool RequiresAppConfigEntry { get; set; }
-		
-		/// <summary>
-		/// Gets the minimum MSBuild version required to build projects with this target framework.
-		/// </summary>
-		public Version MinimumMSBuildVersion { get; set; }
-		
-		/// <summary>
-		/// Gets the previous release of this target framework.
-		/// </summary>
-		public TargetFramework BasedOn { get; set; }
-		
-		public virtual bool IsCompatibleWith(CompilerVersion compilerVersion)
-		{
-			return MinimumMSBuildVersion <= compilerVersion.MSBuildVersion;
-		}
-		
-		public bool IsBasedOn(TargetFramework potentialBase)
-		{
-			TargetFramework tmp = this;
-			while (tmp != null) {
-				if (tmp == potentialBase)
-					return true;
-				tmp = tmp.BasedOn;
-			}
-			return false;
-		}
-		
-		public override string ToString()
-		{
-			return DisplayName;
-		}
-		
-		
-	}
-	
-	public class ClientProfileTargetFramework : TargetFramework
-	{
-		public TargetFramework FullFramework { get; private set; }
-		
-		public ClientProfileTargetFramework(TargetFramework fullFramework)
-			: base(fullFramework.Name + "Client", fullFramework.DisplayName + " Client Profile")
-		{
-			this.FullFramework = fullFramework;
-			this.SupportedRuntimeVersion = fullFramework.SupportedRuntimeVersion;
-			this.MinimumMSBuildVersion = fullFramework.MinimumMSBuildVersion;
-			this.IsAvailable = fullFramework.IsAvailable;
-			if (fullFramework.SupportedSku != null)
-				this.SupportedSku = fullFramework.SupportedSku + ",Profile=Client";
-			else
-				this.SupportedSku = "Client";
-		}
-	}*/
 }
diff --git a/src/Main/Base/Project/Util/DotnetDetection.cs b/src/Main/Base/Project/Util/DotnetDetection.cs
index 9298d9ab52..330de85294 100644
--- a/src/Main/Base/Project/Util/DotnetDetection.cs
+++ b/src/Main/Base/Project/Util/DotnetDetection.cs
@@ -61,6 +61,12 @@ namespace ICSharpCode.SharpDevelop
 			return GetDotnet4Release() >= 378675;
 		}
 		
+		public static bool IsDotnet452Installed()
+		{
+			// 379893 is .NET 4.5.2 on my Win7 machine
+			return GetDotnet4Release() >= 379893;
+		}
+		
 		static int? GetDotnet4Release()
 		{
 			using (var key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full")) {
diff --git a/src/Main/Base/Project/Util/Versions.cs b/src/Main/Base/Project/Util/Versions.cs
index a5ed80a069..e0a751b365 100644
--- a/src/Main/Base/Project/Util/Versions.cs
+++ b/src/Main/Base/Project/Util/Versions.cs
@@ -31,5 +31,6 @@ namespace ICSharpCode.SharpDevelop
 		public static readonly Version V4_0 = new Version(4, 0);
 		public static readonly Version V4_5 = new Version(4, 5);
 		public static readonly Version V4_5_1 = new Version(4, 5, 1);
+		public static readonly Version V4_5_2 = new Version(4, 5, 2);
 	}
 }
diff --git a/src/Main/SharpDevelop/Parser/AssemblyParserService.cs b/src/Main/SharpDevelop/Parser/AssemblyParserService.cs
index 2c999d1e72..0c864e2e7f 100644
--- a/src/Main/SharpDevelop/Parser/AssemblyParserService.cs
+++ b/src/Main/SharpDevelop/Parser/AssemblyParserService.cs
@@ -235,7 +235,8 @@ namespace ICSharpCode.SharpDevelop.Parser
 					break;
 				case TargetRuntime.Net_4_0:
 				default:
-					xmlFileName = LookupLocalizedXmlDoc(Path.Combine(referenceAssembliesPath, @".NETFramework\v4.5.1", name))
+					xmlFileName = LookupLocalizedXmlDoc(Path.Combine(referenceAssembliesPath, @".NETFramework\v4.5.2", name)) 
+						?? LookupLocalizedXmlDoc(Path.Combine(referenceAssembliesPath, @".NETFramework\v4.5.1", name))
 						?? LookupLocalizedXmlDoc(Path.Combine(referenceAssembliesPath, @".NETFramework\v4.5", name))
 						?? LookupLocalizedXmlDoc(Path.Combine(referenceAssembliesPath, @".NETFramework\v4.0", name))
 						?? LookupLocalizedXmlDoc(Path.Combine(frameworkPath, "v4.0.30319", name));

From 96f6ad6d93e441d4c2f87c36d1886fed77c1dee2 Mon Sep 17 00:00:00 2001
From: Andreas Weizel <rpinski@awzhome.de>
Date: Wed, 7 May 2014 00:30:01 +0200
Subject: [PATCH 03/17] Fix #458: Shortcut for 'Reformat code' breaks the '@'
 symbol on Turkish keyboard layouts. Shortcut has been changed to
 Ctrl+Shift+I.

---
 src/Main/Base/Project/ICSharpCode.SharpDevelop.addin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index ce7d1a6f95..4cc90ca9b4 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -2081,7 +2081,7 @@
 		          class = "ICSharpCode.SharpDevelop.Editor.Commands.IndentSelection" />
 		<MenuItem id = "Reformat"
 		          label = "Reformat"
-		          shortcut = "Control|Alt|F"
+		          shortcut = "Control|Shift|I"
 		          class = "ICSharpCode.SharpDevelop.Editor.Commands.ReformatSelection" />
 	</Path>
 	

From 68c1cd6cf78780b60a43c87ef7065c1971a38771 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 7 May 2014 19:35:54 +0200
Subject: [PATCH 04/17] Fix #356: Search and Replace dialog window does not
 scale with DPI setting

---
 .../Project/Gui/SearchAndReplaceDialog.cs                | 9 +++++++++
 src/Main/SharpDevelop/app.template.config                | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
index 697a21bfd9..0046e0fd06 100644
--- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
+++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
@@ -64,6 +64,7 @@ namespace SearchAndReplace
 				
 		public SearchAndReplaceDialog(SearchAndReplaceMode searchAndReplaceMode)
 		{
+			SuspendLayout();
 			this.FormBorderStyle = FormBorderStyle.FixedToolWindow;
 			this.ShowInTaskbar   = false;
 			this.TopMost         = false;
@@ -94,6 +95,10 @@ namespace SearchAndReplace
 			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 @@ namespace SearchAndReplace
 		
 		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>
diff --git a/src/Main/SharpDevelop/app.template.config b/src/Main/SharpDevelop/app.template.config
index 09028ca082..5896802746 100644
--- a/src/Main/SharpDevelop/app.template.config
+++ b/src/Main/SharpDevelop/app.template.config
@@ -85,6 +85,10 @@
 		<!-- Use this setting to disable the code completion cache. Code completion will still be
 		     available, but take longer to load and use more RAM. -->
 		<!-- <add key="domPersistencePath" value="none" /> -->
+		
+		<!-- Tell WinForms to resize some components based on system DPI.
+		     Only has an effect with .NET 4.5.2 or higher. -->
+		<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
 	</appSettings>
 	<log4net>
 		<!-- Writes to the console. The console is only visible in debug builds of SharpDevelop. -->

From 86661808602a4a8e5a814bd147c185a43c1dfb00 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 7 May 2014 20:26:13 +0200
Subject: [PATCH 05/17] Fix a couple of high-DPI problems.

---
 src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs  | 5 ++++-
 src/Main/Base/Project/Resources/CommonAboutDialog.xfrm      | 2 ++
 src/Main/Base/Project/Resources/NewFileDialog.xfrm          | 2 ++
 src/Main/Base/Project/Resources/NewFileWithNameDialog.xfrm  | 2 ++
 .../MessageService/CustomDialog.cs                          | 2 ++
 src/Main/SharpDevelop/Logging/ExceptionBox.cs               | 3 +++
 src/Main/SharpDevelop/Startup/SplashScreen.cs               | 6 ++++--
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
index f558f6d59b..c88ff715ba 100644
--- a/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
+++ b/src/AddIns/DisplayBindings/HexEditor/Project/Src/Editor.cs
@@ -115,7 +115,10 @@ namespace HexEditor
 			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[] {};
diff --git a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm
index c23922536a..a72fa55d89 100644
--- a/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm
+++ b/src/Main/Base/Project/Resources/CommonAboutDialog.xfrm
@@ -11,6 +11,8 @@
 	<StartPosition   value = "CenterScreen"/>
 	<AcceptButton    value = "okButton"/>
 	<CancelButton    value = "okButton"/>
+	<AutoScaleMode   value = "Dpi"/>
+	<AutoScaleDimensions value = "{Width=96, Height=96}"/>
 
 	<Controls>
 		
diff --git a/src/Main/Base/Project/Resources/NewFileDialog.xfrm b/src/Main/Base/Project/Resources/NewFileDialog.xfrm
index be7d4305ee..29244545d9 100644
--- a/src/Main/Base/Project/Resources/NewFileDialog.xfrm
+++ b/src/Main/Base/Project/Resources/NewFileDialog.xfrm
@@ -4,6 +4,8 @@
     <MinimizeBox value="False" />
     <MinimumSize value="350, 190" />
     <MaximizeBox value="False" />
+    <AutoScaleMode value="Dpi" />
+    <AutoScaleDimensions value="{Width=96, Height=96}" />
     <ShowInTaskbar value="False" />
     <Text value="${res:Dialog.NewFile.DialogName}" />
     <ClientSize value="{Width=510, Height=366}" />
diff --git a/src/Main/Base/Project/Resources/NewFileWithNameDialog.xfrm b/src/Main/Base/Project/Resources/NewFileWithNameDialog.xfrm
index 3066e5cd0c..c3eb7f6b46 100644
--- a/src/Main/Base/Project/Resources/NewFileWithNameDialog.xfrm
+++ b/src/Main/Base/Project/Resources/NewFileWithNameDialog.xfrm
@@ -4,6 +4,8 @@
     <MinimumSize value="350, 200" />
     <MinimizeBox value="False" />
     <MaximizeBox value="False" />
+    <AutoScaleMode value="Dpi" />
+    <AutoScaleDimensions value="{Width=96, Height=96}" />
     <ShowInTaskbar value="False" />
     <Text value="${res:Dialog.NewFile.DialogName}" />
     <ClientSize value="{Width=542, Height=372}" />
diff --git a/src/Main/ICSharpCode.Core.WinForms/MessageService/CustomDialog.cs b/src/Main/ICSharpCode.Core.WinForms/MessageService/CustomDialog.cs
index 0ce1616324..5d2f67ff47 100644
--- a/src/Main/ICSharpCode.Core.WinForms/MessageService/CustomDialog.cs
+++ b/src/Main/ICSharpCode.Core.WinForms/MessageService/CustomDialog.cs
@@ -155,6 +155,8 @@ namespace ICSharpCode.Core.WinForms
 			this.KeyPreview = true;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "CustomDialog";
+			this.AutoScaleMode = AutoScaleMode.Dpi;
+			this.AutoScaleDimensions = new SizeF(96, 96);
 		}
 	}
 }
diff --git a/src/Main/SharpDevelop/Logging/ExceptionBox.cs b/src/Main/SharpDevelop/Logging/ExceptionBox.cs
index a5b756f233..7c87c91379 100644
--- a/src/Main/SharpDevelop/Logging/ExceptionBox.cs
+++ b/src/Main/SharpDevelop/Logging/ExceptionBox.cs
@@ -333,11 +333,14 @@ namespace ICSharpCode.SharpDevelop.Logging
 			this.pictureBox.Location = new System.Drawing.Point(0, 0);
 			this.pictureBox.Name = "pictureBox";
 			this.pictureBox.Size = new System.Drawing.Size(224, 464);
+			this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 			this.pictureBox.TabIndex = 0;
 			this.pictureBox.TabStop = false;
 			// 
 			// ExceptionBox
 			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(688, 453);
 			this.Controls.Add(this.closeButton);
 			this.Controls.Add(this.label3);
diff --git a/src/Main/SharpDevelop/Startup/SplashScreen.cs b/src/Main/SharpDevelop/Startup/SplashScreen.cs
index 0e62bacc65..27859348c8 100644
--- a/src/Main/SharpDevelop/Startup/SplashScreen.cs
+++ b/src/Main/SharpDevelop/Startup/SplashScreen.cs
@@ -104,8 +104,10 @@ namespace ICSharpCode.SharpDevelop.Startup
 					}
 					
 					string param = arg.Substring(markerLength);
-					// work around .NET "feature" that causes trouble with /addindir:"c:\temp\"
-					// http://www.mobzystems.com/code/bugingetcommandlineargs.aspx
+					// The SharpDevelop AddIn project template uses /addindir:"c:\temp\"
+					// but that actually means the last quote is escaped.
+					// This HACK makes this work anyways by replacing the trailing quote
+					// with a backslash:
 					if (param.EndsWith("\"", StringComparison.Ordinal))
 						param = param.Substring(0, param.Length - 1) + "\\";
 					parameterList.Add(param);

From ceeb58b13320546b54c5629c313b4fd0ee97866e Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 7 May 2014 20:29:49 +0200
Subject: [PATCH 06/17] Don't catch ProjectLoadException in ProjectDescriptor.

The whole template creation process (ProjectTemplate.CreateProjects) should throw the exception so that exception details are available to the caller.
This fixes displaying the ToolNotFoundDialog when creating a WiX project without installing the WiX toolset.
---
 .../Templates/Project/ProjectDescriptor.cs           | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Main/SharpDevelop/Templates/Project/ProjectDescriptor.cs b/src/Main/SharpDevelop/Templates/Project/ProjectDescriptor.cs
index f1e9a787b0..4b4a49761a 100644
--- a/src/Main/SharpDevelop/Templates/Project/ProjectDescriptor.cs
+++ b/src/Main/SharpDevelop/Templates/Project/ProjectDescriptor.cs
@@ -426,15 +426,9 @@ namespace ICSharpCode.SharpDevelop.Templates
 				}
 				#endregion
 				
-				#region Create Project
-				try {
-					info.InitializeTypeSystem = false;
-					project = languageinfo.CreateProject(info);
-				} catch (ProjectLoadException ex) {
-					MessageService.ShowError(ex.Message);
-					return false;
-				}
-				#endregion
+				// Create Project
+				info.InitializeTypeSystem = false;
+				project = languageinfo.CreateProject(info);
 				
 				#region Create Project Items, Imports and Files
 				// Add Project items

From 929fc8e4f16de58e6941ee5e04aacc0ea2bc28f6 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 7 May 2014 20:37:41 +0200
Subject: [PATCH 07/17] More high-DPI fixes.

---
 .../Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs   | 3 +++
 src/AddIns/DisplayBindings/IconEditor/EditorPanel.Designer.cs  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs
index e61fdc445c..79f1163c0a 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs
+++ b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs
@@ -47,6 +47,7 @@ namespace ICSharpCode.SharpDevelop.Services
 			this.pictureBox.Size = new System.Drawing.Size(48, 52);
 			this.pictureBox.TabIndex = 0;
 			this.pictureBox.TabStop = false;
+			this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 			// 
 			// lblExceptionText
 			// 
@@ -113,6 +114,8 @@ namespace ICSharpCode.SharpDevelop.Services
 			// 
 			// DebuggeeExceptionForm
 			// 
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
 			this.ClientSize = new System.Drawing.Size(642, 399);
 			this.Controls.Add(this.btnContinue);
 			this.Controls.Add(this.btnBreak);
diff --git a/src/AddIns/DisplayBindings/IconEditor/EditorPanel.Designer.cs b/src/AddIns/DisplayBindings/IconEditor/EditorPanel.Designer.cs
index 2f6640bddd..5bb84747ee 100644
--- a/src/AddIns/DisplayBindings/IconEditor/EditorPanel.Designer.cs
+++ b/src/AddIns/DisplayBindings/IconEditor/EditorPanel.Designer.cs
@@ -137,7 +137,8 @@ namespace ICSharpCode.IconEditor
 			// 
 			// EditorPanel
 			// 
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
 			this.Controls.Add(this.table);
 			this.Controls.Add(this.panel2);
 			this.Name = "EditorPanel";

From 35ed1ef0d0cadf82cd05d3ca606b22d58903c4f8 Mon Sep 17 00:00:00 2001
From: Andreas Weizel <rpinski@awzhome.de>
Date: Sat, 10 May 2014 17:44:14 +0200
Subject: [PATCH 08/17] Fix #471: Debugger console crashes with
 "DebuggerException: Evaluation did not return any value" when invoking a
 method returning `void`

---
 src/AddIns/Debugger/Debugger.Core/Eval.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/Debugger/Debugger.Core/Eval.cs b/src/AddIns/Debugger/Debugger.Core/Eval.cs
index 2771cfb726..0441286abc 100644
--- a/src/AddIns/Debugger/Debugger.Core/Eval.cs
+++ b/src/AddIns/Debugger/Debugger.Core/Eval.cs
@@ -78,7 +78,7 @@ namespace Debugger
 						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");
 				}

From b48164d33104cd9d00c64b628c55a06817954ef0 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 18:22:11 +0200
Subject: [PATCH 09/17] Fix build by ignoring the broken debugger unit test.
 See #472 for details.

---
 .../Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
index 7ee16bda9d..2c6f08f1f3 100644
--- a/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
+++ b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.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();

From 9b67631e5599fe0a03fb2b26ee7969a67023c53b Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:12:12 +0200
Subject: [PATCH 10/17] Debugger: During callback processing, handle the
 COMException "Process was terminated. (Exception from HRESULT: 0x80131301)".

The exception 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).
---
 src/AddIns/Debugger/Debugger.Core/Process.cs | 30 +++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/AddIns/Debugger/Debugger.Core/Process.cs b/src/AddIns/Debugger/Debugger.Core/Process.cs
index 542bb4a480..6ebdeee737 100644
--- a/src/AddIns/Debugger/Debugger.Core/Process.cs
+++ b/src/AddIns/Debugger/Debugger.Core/Process.cs
@@ -20,6 +20,7 @@ using System;
 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 @@ namespace Debugger
 		{
 			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();
 			}

From b171c5210f0a40e85504a7c71e943efd8f3d9d7c Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:25:23 +0200
Subject: [PATCH 11/17] ForeachStatement.EmbeddedStatement doesn't return null,
 but it might return Statement.Null.

---
 .../CodeActions/ConvertForeachToForAction.cs                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs
index 83c2665b9c..be81d4e140 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/ConvertForeachToForAction.cs
@@ -67,7 +67,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 			bool hasIndexAccess;
 			var foreachStatement = GetForeachStatement(context, out hasIndexAccess);
-			if (foreachStatement == null || foreachStatement.EmbeddedStatement == null)
+			if (foreachStatement == null || foreachStatement.EmbeddedStatement.IsNull)
 				yield break;
 			var state = context.GetResolverStateBefore (foreachStatement.EmbeddedStatement);
 			string name = GetName(state, VariableNames);

From 04a076956d814490b851a974e757ac87c1f1f8c7 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:32:08 +0200
Subject: [PATCH 12/17] Try to fix NullReferenceException in
 UnreachableCodeIssue.

---
 .../CodeIssues/Custom/UnreachableCodeIssue.cs  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs
index 75817fdb42..82adad72c9 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Custom/UnreachableCodeIssue.cs
@@ -133,6 +133,18 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					if (statement == null || !AddStatement(statement))
 						base.VisitChildren(node);
 				}
+				
+				static TextLocation GetPrevEnd(AstNode node)
+				{
+					var prev = node.GetPrevNode(n => !(n is NewLineNode));
+					return prev != null ? prev.EndLocation : node.StartLocation;
+				}
+
+				static TextLocation GetNextStart(AstNode node)
+				{
+					var next = node.GetNextNode(n => !(n is NewLineNode));
+					return next != null ? next.StartLocation : node.EndLocation;
+				}
 
 				bool AddStatement(Statement statement)
 				{
@@ -147,7 +159,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					}
 
 
-					var prevEnd = statement.GetPrevNode(n => !(n is NewLineNode)).EndLocation;
+					var prevEnd = GetPrevEnd(statement);
 					TextLocation start;
 					TextLocation end;
 
@@ -159,12 +171,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 						collectedStatements.Add(statement);
 						visitor.unreachableNodes.Add(statement);
 						collectedStatements.Add(ife.ElseToken);
-						end = ife.ElseToken.GetNextNode(n => !(n is NewLineNode)).StartLocation;
+						end = GetNextStart(ife.ElseToken);
 					} else if (statement.Role == IfElseStatement.FalseRole) {
 						var ife = (IfElseStatement)statement.Parent;
 						start = ife.ElseToken.StartLocation;
 						collectedStatements.Add(ife.ElseToken);
-						prevEnd = ife.ElseToken.GetPrevNode(n => !(n is NewLineNode)).EndLocation;
+						prevEnd = GetPrevEnd(ife.ElseToken);
 						collectedStatements.Add(statement);
 						visitor.unreachableNodes.Add(statement);
 						end = statement.EndLocation;

From 09a0c5ca3991e833fd94e6d32062be07b5629ec6 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:33:50 +0200
Subject: [PATCH 13/17] Try to fix InvalidCastException in
 CreateOverloadWithoutParameterAction

---
 .../CodeActions/CreateOverloadWithoutParameterAction.cs    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
index bbbcb26208..6b61245783 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeActions/CreateOverloadWithoutParameterAction.cs
@@ -53,7 +53,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				return null;
 
 			// find existing method
-			var method = (IMethod)((MemberResolveResult)context.Resolve (methodDecl)).Member;
+			var resolveResult = context.Resolve(methodDecl) as MemberResolveResult;
+			if (resolveResult == null)
+				return null;
+			var method = resolveResult.Member as IMethod;
+			if (method == null)
+				return null;
 			var parameters = new List<IParameter> (method.Parameters.Where (param => param.Name != node.Name));
 			if (method.DeclaringType.GetMethods (
 				m => m.Name == method.Name && m.TypeParameters.Count == method.TypeParameters.Count)

From 93e368d5e22db791f8161274b06a81e3b27eb0e4 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:39:02 +0200
Subject: [PATCH 14/17] ILSpySymbolSource.GetLocalVariables: in case of error,
 return an empty collection instead of null

---
 src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
index 51c6e1eea9..218178354b 100644
--- a/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
+++ b/src/AddIns/DisplayBindings/ILSpyAddIn/ILSpySymbolSource.cs
@@ -96,7 +96,7 @@ namespace ICSharpCode.ILSpyAddIn
 			var file = GetSymbols(method);
 			
 			if (file == null || !file.DebugSymbols.ContainsKey(id))
-				return null;
+				return Enumerable.Empty<ILLocalVariable>();
 			
 			var symbols = file.DebugSymbols[id];
 			

From 7936c3247b2f3f93ed3bf5d0746bfe4aefdcf488 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:41:55 +0200
Subject: [PATCH 15/17] XmlDocumentationElement: return null if given a null
 entity

---
 .../ICSharpCode.NRefactory.Xml/DocumentationElement.cs          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs
index 6cfd57c4a2..d3dcc39194 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.Xml/DocumentationElement.cs
@@ -39,6 +39,8 @@ namespace ICSharpCode.NRefactory.Xml
 		/// </summary>
 		public static XmlDocumentationElement Get(IEntity entity, bool inheritDocIfMissing = true)
 		{
+			if (entity == null)
+				return null;
 			var documentationComment = entity.Documentation;
 			if (documentationComment != null) {
 				return Create(documentationComment, entity);

From 9735fe99e873da061ad2c2be21993c672a4631f1 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:50:03 +0200
Subject: [PATCH 16/17] In SavePreferences(), ignore not only IOException, but
 also UnauthorizedAccessException.

---
 src/Main/SharpDevelop/Project/Solution.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Main/SharpDevelop/Project/Solution.cs b/src/Main/SharpDevelop/Project/Solution.cs
index 1d8b488155..c1a3071d5f 100644
--- a/src/Main/SharpDevelop/Project/Solution.cs
+++ b/src/Main/SharpDevelop/Project/Solution.cs
@@ -325,6 +325,7 @@ namespace ICSharpCode.SharpDevelop.Project
 					sdSettings.Save(sdSettingsFileName);
 				}
 			} catch (IOException) {
+			} catch (UnauthorizedAccessException) {
 				// ignore errors writing to extra properties
 			}
 		}

From 6147f605bbbf464518cbe8ce901c85c9a30d9fba Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 10 May 2014 20:53:54 +0200
Subject: [PATCH 17/17] Fix ArgumentNullException in
 RedundantCatchClauseIssue.GatherVisitor.IsRedundant()

---
 .../Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
index 351e0d4079..ff2b2b61de 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantCatchClauseIssue.cs
@@ -146,8 +146,11 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					if (nextClause != null) {
 						if (nextClause.Type.IsNull && !IsThrowsClause(nextClause))
 							return false;
-						if (!IsThrowsClause(nextClause) && type.GetDefinition ().IsDerivedFrom (ctx.Resolve (nextClause.Type).Type.GetDefinition ()))
-							return false;
+						if (!IsThrowsClause(nextClause)) {
+							var typeDef = type.GetDefinition();
+							if (typeDef == null || typeDef.IsDerivedFrom(ctx.Resolve(nextClause.Type).Type.GetDefinition()))
+								return false;
+						}
 					}
 					n = n.NextSibling;
 				}