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

Author: PeterForstmeier

data/resources/StringResources.resx

@@ -6054,6 +6054,10 @@ Removed the end part of the original message ", reason '${Message}'" since this
   <data name="ProjectComponent.ContextMenu.AddReference" xml:space="preserve">
     <value>Add Reference</value>
   </data>
+  <data name="ProjectComponent.ContextMenu.AddServiceReference" xml:space="preserve">
+    <value>Add Service Reference</value>
+    <comment>Right click context menu option to add a service reference to the project.</comment>
+  </data>
   <data name="ProjectComponent.ContextMenu.AddWebReference" xml:space="preserve">
     <value>Add Web Reference</value>
     <comment>Right click context menu option to add a web reference to the project.</comment>

doc/Dependencies.html

@@ -63,6 +63,10 @@
 				<td style="padding-right: 8px;">.NET Framework 3.5 SP1 and below</td>
 				<td>Included with .NET framework</td>
 			</tr>
+			<tr>
+				<td>.NET Portable Class Libraries</td>
+				<td><a href="http://visualstudiogallery.msdn.microsoft.com/b0e0b5e9-e138-410b-ad10-00cb3caf4981/">Portable Library Tools - Install with the /buildmachine switch</a></td>
+			</tr>
 		</table>
 
 		<p>

src/AddIns/Analysis/UnitTesting/Model/ITest.cs

@@ -54,7 +54,7 @@ public interface ITest
 		string DisplayName { get; }
 
 		/// <summary>
-		/// Raised when the <see cref="Name"/> property changes.
+		/// Raised when the <see cref="DisplayName"/> property changes.
 		/// </summary>
 		event EventHandler DisplayNameChanged;
 

src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs

@@ -84,6 +84,10 @@ public override void ActivateItem(RoutedEventArgs e)
 		public override bool ShowExpander {
 			get { return test.CanExpandNestedTests && base.ShowExpander; }
 		}
+		
+		public override bool CanExpandRecursively {
+			get { return true; }
+		}
 		#endregion
 
 		#region Icon + Text

src/Main/Base/Project/ICSharpCode.SharpDevelop.addin

@@ -366,7 +366,7 @@
 			          label = "${res:ProjectComponent.ContextMenu.AddReference}"
 			          class = "ICSharpCode.SharpDevelop.Project.Commands.AddReferenceToProject"/>
 			<MenuItem id    = "AddServiceReference"
-			          label = "Add Service Reference"
+			          label = "${res:ProjectComponent.ContextMenu.AddServiceReference}"
 			          class = "ICSharpCode.SharpDevelop.Project.Commands.AddServiceReferenceToProject"/>
 			<MenuItem id    = "AddWebReference"
 			          label = "${res:ProjectComponent.ContextMenu.AddWebReference}"
@@ -437,7 +437,7 @@
 			          label = "${res:ProjectComponent.ContextMenu.AddReference}"
 			          class = "ICSharpCode.SharpDevelop.Project.Commands.AddReferenceToProject"/>
 			<MenuItem id    = "AddServiceReference"
-			          label = "Add Service Reference"
+			          label = "${res:ProjectComponent.ContextMenu.AddServiceReference}"
 			          class = "ICSharpCode.SharpDevelop.Project.Commands.AddServiceReferenceToProject"/>
 			<MenuItem id    = "AddWebReference"
 			          label = "${res:ProjectComponent.ContextMenu.AddWebReference}"
@@ -773,7 +773,7 @@
 
 	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ServiceReferencesFolderNode">
 		<MenuItem id    = "AddServiceReference"
-		          label = "Add Service Reference"
+		          label = "${res:ProjectComponent.ContextMenu.AddServiceReference}"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.AddServiceReferenceToProject"/>
 		<Condition name = "Ownerstate" ownerstate = "Missing">
 			<MenuItem id = "RemoveMissing"
@@ -1655,6 +1655,9 @@
 				<MenuItem id    = "AddReference"
 				          label = "${res:ProjectComponent.ContextMenu.AddReference}"
 				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddReferenceToProject"/>
+				<MenuItem id    = "AddServiceReference"
+				          label = "${res:ProjectComponent.ContextMenu.AddServiceReference}"
+				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddServiceReferenceToProject"/>
 				<MenuItem id    = "AddWebReference"
 				          label = "${res:ProjectComponent.ContextMenu.AddWebReference}"
 				          class = "ICSharpCode.SharpDevelop.Project.Commands.AddWebReferenceToProject"/>

src/Main/Base/Project/Project/PortableLibrary/CheckPortableLibraryInstalled.cs

@@ -17,9 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;
 
@@ -30,15 +27,22 @@ namespace ICSharpCode.SharpDevelop.Project.PortableLibrary
 	/// </summary>
 	public class CheckPortableLibraryInstalled : AbstractCommand
 	{
+		public static string CouldNotFindToolsDescription {
+			get {
+				return StringParser.Parse(
+					"${res:PortableLibrary.CouldNotFindTools}" + Environment.NewLine + Environment.NewLine
+					+ "${res:PortableLibrary.ToolsInstallationHelp}");
+			}
+		}
+		
+		public static string DownloadUrl {
+			get { return "http://go.microsoft.com/fwlink/?LinkId=210823"; }
+		}
+		
 		public override void Run()
 		{
 			if (!ProfileList.IsPortableLibraryInstalled()) {
-				using (ToolNotFoundDialog dlg = new ToolNotFoundDialog(
-					StringParser.Parse(
-						"${res:PortableLibrary.CouldNotFindTools}" + Environment.NewLine + Environment.NewLine +
-						"${res:PortableLibrary.ToolsInstallationHelp}"),
-					"http://go.microsoft.com/fwlink/?LinkId=210823"
-				)) {
+				using (ToolNotFoundDialog dlg = new ToolNotFoundDialog(CouldNotFindToolsDescription, DownloadUrl)) {
 					// our message is long, so make the window bigger than usual
 					dlg.Width += 70;
 					dlg.Height += 70;

src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

@@ -34,6 +34,7 @@
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Exceptions;
+using ICSharpCode.SharpDevelop.Project.PortableLibrary;
 using MSBuild = Microsoft.Build.Evaluation;
 
 namespace ICSharpCode.SharpDevelop.Project
@@ -1243,12 +1244,14 @@ public MSBuildBasedProject(ProjectLoadInformation loadInformation)
 						} else {
 							throw;
 						}
+					} else if (ex.ErrorCode == "MSB4019" && ex.BaseMessage.Contains("Microsoft.Portable.") && !ProfileList.IsPortableLibraryInstalled()) {
+						throw new ToolNotFoundProjectLoadException(ex.Message, ex) {
+							Description = CheckPortableLibraryInstalled.CouldNotFindToolsDescription,
+							LinkTarget = CheckPortableLibraryInstalled.DownloadUrl
+						};
 					} else {
 						throw;
 					}
-					if (!(ex.ErrorCode == "MSB4132" && UpgradeToolsVersion(loadInformation))) {
-						throw;
-					}
 				}
 				success = true;
 			} catch (InvalidProjectFileException ex) {