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

README.md

@@ -0,0 +1,119 @@
+# #develop (short for SharpDevelop) 
+
+##Overview
+
+ #develop is a free Integrated Development Environment
+(IDE) for C#, VB.NET, Boo, IronPython, IronRuby and F# projects on Microsoft's
+.NET platform. It is written (almost) entirely in C#, and comes with features 
+you would expect in an IDE plus a few more.
+
+The #develop project started on September 11th, 2000. The project was initiated
+by Mike Krüger. In the course of the project, several contributors joined in.
+If you want to contribute see ["Joining the team"](https://github.com/icsharpcode/SharpDevelop/wiki/Joining-the-Team).
+
+1. [Official Website](http://www.icsharpcode.net/OpenSource/SD/Default.aspx)
+2. [Forums](http://community.sharpdevelop.net/forums/)
+3. [Build Artefacts (Nightly Builds)](http://build.sharpdevelop.net/BuildArtefacts)
+
+##How To Compile
+ #Develop can be compiled using the supplied .bat files, or in #Develop itself.
+
+##System Requirements (running #Develop)
+
+ - Windows Vista or higher.
+ - [.NET 4.5](http://www.microsoft.com/en-au/download/details.aspx?id=30653)
+ - [Visual C++ 2008 SP1 Runtime](http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&displaylang=en)
+
+##Extended Requirements (building #Develop)
+
+ - [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22)
+ - [.NET 4.5 SDK](http://www.microsoft.com/en-au/download/details.aspx?id=30653) (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx))
+ - Windows SDK 7.1 (?? not sure if this still is necessary...)
+ - Windows SDK 7.0 (optional; C++ compiler needed for profiler)
+ - [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595)
+ - [SD Git Repository](https://github.com/icsharpcode/SharpDevelop.git)
+ 
+##Libraries and Integrated tools:
+
+* [Avalon Dock](http://avalondock.codeplex.com/) : New BSD License (BSD) (thanks to **Adolfo Marinucci**)
+* [Graph#](https://graphsharp.codeplex.com/)
+* [IQToolkit](https://iqtoolkit.codeplex.com/)
+* [Irony](https://irony.codeplex.com/)
+* [ITextSharp](http://sourceforge.net/projects/itextsharp/)
+* [log4Net](https://github.com/apache/log4net)
+* Mono T4
+* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**) - 
+* [Sharp Svn](https://sharpsvn.open.collab.net/)
+* [SQLite](https://sqlite.org/)
+* [WPFToolkit](https://wpf.codeplex.com/)
+
+##Integrated Tools (packaged with #Develop):
+
+* [IronPython](http://ironpython.net/)
+* [IronRuby](https://ironruby.codeplex.com/)
+* [NuGet](https://nuget.codeplex.com/)
+* [NUnit](http://www.nunit.org/)
+* [OpenCover](https://github.com/OpenCover/opencover)
+* [WiX](https://wix.codeplex.com/)
+
+##Reusable Libraries (Part of #Develop):
+
+* [AvalonEdit](https://github.com/icsharpcode/SharpDevelop/wiki/AvalonEdit)
+* Debugger.Core
+* [ICSharpCode.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Main/Core)
+* [ICSharpCode.Decompiler](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/ICSharpCode.Decompiler)
+* [NRefactory](https://github.com/icsharpcode/NRefactory)
+* [SharpTreeView](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/SharpTreeView)
+* [WPF Designer]( https://github.com/icsharpcode/SharpDevelop/tree/master/src/AddIns/DisplayBindings/WpfDesign)
+
+## #Develop Contributors
+
+###Developers
+
+* [Mike Krüger](https://github.com/mkrueger) (Project Founder)
+* [Daniel Grunwald](https://github.com/dgrunwald) (Technical Lead)
+* [Andreas Weizel](https://github.com/Rpinski)
+* [Matt Ward](https://github.com/mrward)
+* [David Srbecky](https://github.com/dsrbecky)(Debugger)
+* [Siegfried Pammer](https://github.com/siegfriedpammer)
+* [Peter Forstmeier]( https://github.com/PeterForstmeier)(#Develop Reports)	
+
+###Non-Developers
+
+* Christoph Wille (PM)
+* Bernhard Spuida (Kalfaktor)
+
+###Past Developers (Non-Exhaustive List)
+
+* [Mike Krüger](https://github.com/mkrueger) (Project Founder)
+* Alexandre Semenov
+* Andrea Paatz
+* Christian Hornung
+* David Alpert
+* Denis ERCHOFF
+* Dickon Field
+* Georg Brandl
+* Ifko Kovacka
+* Itai Bar-Haim
+* Ivan Shumilin
+* John Reilly
+* John Simons
+* Justin Dearing
+* Markus Palme
+* Mathias Simmack
+* Matt Everson
+* Nathan Allan
+* Nikola Kavaldjiev
+* Philipp Maihart
+* Poul Staugaard
+* Robert Pickering
+* Robert Zaunere
+* Roman Taranchenko
+* Russell Wilkins
+* Scott Ferrett
+* Sergej Andrejev
+* Shinsaku Nakagawa
+* Tomasz Tretkowski
+* Troy Simpson
+
+######Copyright 2014 AlphaSierraPapa for the SharpDevelop team. SharpDevelop is distributed under the MIT license.

README.txt

@@ -1,74 +0,0 @@
-#develop (short for SharpDevelop) is a free IDE for .NET programming languages.
-Website: http://www.icsharpcode.net/OpenSource/SD/Default.aspx
-Forums: http://community.sharpdevelop.net/forums/
-Nightly builds: http://build.sharpdevelop.net/BuildArtefacts
-
-Copyright 2014 AlphaSierraPapa for the SharpDevelop team.
-SharpDevelop is distributed under the MIT license.
-
-The #develop project started on September 11th, 2000. The project was initiated
-by Mike Krüger. In the course of the project, several contributors joined in.
-If you want to contribute see <https://github.com/icsharpcode/SharpDevelop/wiki/Joining-the-Team>.
-
-Overview
-#develop (short for SharpDevelop) is a free Integrated Development Environment
-(IDE) for C#, VB.NET, Boo, IronPython, IronRuby and F# projects on Microsoft's
-.NET platform. It is written (almost) entirely in C#, and comes with features 
-you would expect in an IDE plus a few more.
-
-How To Compile
-SharpDevelop can be compiled using the supplied .bat files, or in SharpDevelop itself.
-
-System Requirements (running SharpDevelop)
- - Windows Vista or higher.
- - .NET 4.5
- - Visual C++ 2008 SP1 Runtime (http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&displaylang=en)
-
-Extended Requirements (building SharpDevelop)
- - .NET 3.5 SP1
- - .NET 4.5 SDK (part of Windows SDK 8.0)
- - Windows SDK 7.1 (?? not sure if this still is necessary...)
- - Windows SDK 7.0 (optional; C++ compiler needed for profiler)
- - Windows PowerShell
- - if you have cloned the SD git repository: git must be available on your PATH
- 
-Libraries and integrated tools:
-	AvalonDock: New BSD License (BSD) (thanks to Adolfo Marinucci) - http://avalondock.codeplex.com/
-	GraphSharp
-	IQToolkit
-	Irony
-	ITextSharp
-	log4net
-	Mono T4
-	Mono.Cecil: MIT License (thanks to Jb Evain) - https://github.com/jbevain/cecil
-	SharpSvn
-	SQLite
-	WPFToolkit
-
-Integrated Tools (shipping with SharpDevelop):
-	IronPython
-	IronRuby
-	NuGet
-	NUnit
-	OpenCover - https://github.com/OpenCover/opencover
-	WiX
-
-Reusable Libraries (developed as part of SharpDevelop):
-	AvalonEdit
-	Debugger.Core
-	ICSharpCode.Core
-	ICSharpCode.Decompiler
-	NRefactory
-	SharpTreeView
-	WPF Designer
-
-SharpDevelop Contributors:
-	Mike Krüger (Project Founder)
-	Daniel Grunwald (Technical Lead)
-	Andreas Weizel
-	Matt Ward
-	David Srbecky (Debugger)
-	Siegfried Pammer
-	Peter Forstmeier (SharpDevelop Reports)	
-	
-	(for a full list see https://github.com/icsharpcode/SharpDevelop/wiki/Contributors)

src/AddIns/Analysis/UnitTesting/Commands/PadCommands.cs

@@ -54,6 +54,21 @@ namespace ICSharpCode.UnitTesting
 		}
 	}
 	
+	public class ExpandAllTestsCommand : AbstractMenuCommand
+	{
+		public override void Run()
+		{
+			if (!(this.Owner is SharpTreeView))
+				return;
+			
+			var treeView = (SharpTreeView)this.Owner;
+			if (treeView.Root != null) {
+				foreach (var n in treeView.Root.Descendants())
+					n.IsExpanded = true;
+			}
+		}
+	}
+	
 	public class CollapseAllTestsCommand : AbstractMenuCommand
 	{
 		public override void Run()

src/AddIns/Analysis/UnitTesting/UnitTesting.addin

@@ -100,6 +100,10 @@
 			             tooltip="${res:NUnitPad.NUnitPadContent.ReferenceItem}"
 			             class="ICSharpCode.UnitTesting.AddNUnitReferenceCommand"/>
 			<ToolbarItem id = "CollapseSeparator" type = "Separator"/>
+			<ToolbarItem id      = "ExpandAll"
+		             icon        = "Icons.16x16.OpenCollection"
+		             tooltip     = "${res:MainWindow.Windows.SearchResultPanel.ExpandAll.ToolTip}"
+		             class       = "ICSharpCode.UnitTesting.ExpandAllTestsCommand"/>
 			<ToolbarItem id      = "Collapse"
 			             icon    = "Icons.16x16.Collection"
 			             tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"

src/AddIns/BackendBindings/CSharpBinding/Project/Src/CaretReferenceHighlightRenderer.cs

@@ -141,18 +141,21 @@ namespace CSharpBinding
 
 		void CaretLocationChanged(object sender, EventArgs e)
 		{
+			if (caretMovementTokenSource != null)
+				caretMovementTokenSource.Cancel();
 			timer.Stop();
 			timer.Start();
 		}
 		
-		void ResolveAtCaret()
+		async void ResolveAtCaret()
 		{
 			timer.Stop();
-			if (caretMovementTokenSource != null)
-				caretMovementTokenSource.Cancel();
 			caretMovementTokenSource = new CancellationTokenSource();
-			var rr = SD.ParserService.Resolve(editor.FileName, editor.Caret.Location, editor.Document, cancellationToken: caretMovementTokenSource.Token);
-			SetCurrentSymbol(rr.GetSymbol());
+			try {
+				var rr = await SD.ParserService.ResolveAsync(editor.FileName, editor.Caret.Location, editor.Document, cancellationToken: caretMovementTokenSource.Token);
+				SetCurrentSymbol(rr.GetSymbol());
+			} catch (OperationCanceledException) {
+			}
 		}
 
 		IResolveVisitorNavigator InitNavigator(ICompilation compilation)
@@ -199,7 +202,7 @@ namespace CSharpBinding
 		void VisitVisibleNodes(AstNode node, IResolveVisitorNavigator currentNavigator, CSharpAstResolver resolver, int start, int end)
 		{
 			if (!CSharpAstResolver.IsUnresolvableNode(node))
-				currentNavigator.Resolved(node, resolver.Resolve(node, caretMovementTokenSource.Token));
+				currentNavigator.Resolved(node, resolver.Resolve(node));
 			for (var child = node.FirstChild; child != null; child = child.NextSibling) {
 				if (child.StartLocation.Line <= end && child.EndLocation.Line >= start)
 					VisitVisibleNodes(child, currentNavigator, resolver, start, end);

src/AddIns/BackendBindings/FSharpBinding/FSharpInteractive.cs

@@ -108,6 +108,7 @@ namespace FSharpBinding
 		string FindFSharpInteractiveInProgramFilesFolder()
 		{
 			var fileNames = new string [] {
+				@"Microsoft SDKs\F#\3.1\Framework\v4.0\Fsi.exe",
 				@"Microsoft SDKs\F#\3.0\Framework\v4.0\Fsi.exe",
 				@"Microsoft F#\v4.0\Fsi.exe"
 			};

src/AddIns/BackendBindings/FSharpBinding/Templates/FSharp3ConsoleProject.xpt

@@ -31,7 +31,7 @@
 		</PropertyGroup>
 
 		<Imports clear="True">
-			<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+			<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
 		</Imports>
 		
 		<Files>

src/AddIns/BackendBindings/FSharpBinding/Templates/FSharp3LibraryProject.xpt

@@ -31,7 +31,7 @@
 		</PropertyGroup>
 		
 		<Imports clear="True">
-			<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+			<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
 		</Imports>
 		
 		<Files>

src/AddIns/Misc/AddinScout/Project/Src/Gui/CodonListPanel.cs

@@ -18,6 +18,7 @@
 
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 
 using ICSharpCode.Core;
@@ -53,6 +54,7 @@ namespace AddInScout
 			CodonLV.Columns.Add("Codon ID", 175,HorizontalAlignment.Left);
 			CodonLV.Columns.Add("Codon Class", 400,HorizontalAlignment.Left);
 			CodonLV.Columns.Add("Codon Condition -> Action on Fail", 600,HorizontalAlignment.Left);
+			CodonLV.Columns.Add("Label", 450, HorizontalAlignment.Left);
 			
 			ExtTextBox.Text = "Extension : ";
 			ExtTextBox.ReadOnly = true;
@@ -105,9 +107,8 @@ namespace AddInScout
 				
 				lvi.SubItems.Add(c.Properties.Contains("class") ? c.Properties["class"] : "");
 				
-				foreach (ICondition condition in c.Conditions) {
-					lvi.SubItems.Add(condition.Name + ", " + condition.Action);
-				}
+				lvi.SubItems.Add(string.Join(";", c.Conditions.Select(a => a.Name + ": " + a.Action)));
+				lvi.SubItems.Add(c.Properties.Contains("label") ? c.Properties["label"] : "");
 				CodonLV.Items.Add(lvi);
 			}
 		}

src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs

@@ -68,6 +68,7 @@ namespace ICSharpCode.PackageManagement
 			try {
 				repository = RegisteredPackageRepositories.ActiveRepository;
 			} catch (Exception ex) {
+				repository = null;
 				errorMessage = ex.Message;
 			}
 		}

src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs

@@ -385,7 +385,7 @@ namespace PackageManagement.Tests
 		public void ReadPackages_ExceptionThrownWhenAccessingActiveRepository_ErrorMessageFromExceptionNotOverriddenByReadPackagesCall()
 		{
 			CreateExceptionThrowingRegisteredPackageRepositories();
-			exceptionThrowingRegisteredPackageRepositories.ExeptionToThrowWhenActiveRepositoryAccessed = 
+			exceptionThrowingRegisteredPackageRepositories.ExceptionToThrowWhenActiveRepositoryAccessed = 
 				new Exception("Test");
 			CreateViewModel(exceptionThrowingRegisteredPackageRepositories);
 			viewModel.ReadPackages();
@@ -621,5 +621,33 @@ namespace PackageManagement.Tests
 			};
 			PackageCollectionAssert.AreEqual(expectedPackages, allPackages);
 		}
+		
+		[Test]
+		public void ReadPackages_ActiveRepositoryChangedWhichUsesInvalidUrl_InvalidUrlExceptionIsShownAsErrorMessage()
+		{
+			CreateExceptionThrowingRegisteredPackageRepositories();
+			CreateViewModel(exceptionThrowingRegisteredPackageRepositories);
+			var package = new FakePackage("Test", "0.1.0.0");
+			exceptionThrowingRegisteredPackageRepositories
+				.FakeActiveRepository
+				.FakePackages
+				.Add(package);
+			viewModel.ReadPackages();
+			CompleteReadPackagesTask();
+			taskFactory.ClearAllFakeTasks();
+			exceptionThrowingRegisteredPackageRepositories.ExceptionToThrowWhenActiveRepositoryAccessed =
+				new Exception("Invalid url");
+			
+			viewModel.ReadPackages();
+			FakeTask<PackagesForSelectedPageResult> task = taskFactory.FirstFakeTaskCreated;
+			ApplicationException ex = Assert.Throws<ApplicationException>(() => task.ExecuteTaskButNotContinueWith());
+			task.Exception = new AggregateException(ex);
+			task.IsFaulted = true;
+			task.ExecuteContinueWith();
+			
+			Assert.AreEqual("Invalid url", ex.Message);
+			Assert.IsTrue(viewModel.HasError);
+			Assert.AreEqual("Invalid url", viewModel.ErrorMessage);
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingRegisteredPackageRepositories.cs

@@ -25,23 +25,23 @@ namespace PackageManagement.Tests.Helpers
 {
 	public class ExceptionThrowingRegisteredPackageRepositories : FakeRegisteredPackageRepositories
 	{
-		public Exception ExeptionToThrowWhenActiveRepositoryAccessed { get; set; }
+		public Exception ExceptionToThrowWhenActiveRepositoryAccessed { get; set; }
 		
 		public override IPackageRepository ActiveRepository {
 			get {
-				if (ExeptionToThrowWhenActiveRepositoryAccessed != null) {
-					throw ExeptionToThrowWhenActiveRepositoryAccessed;
+				if (ExceptionToThrowWhenActiveRepositoryAccessed != null) {
+					throw ExceptionToThrowWhenActiveRepositoryAccessed;
 				}
 				return base.ActiveRepository;
 			}
 		}
 		
-		public Exception ExeptionToThrowWhenRecentPackageRepositoryAccessed { get; set; }
+		public Exception ExceptionToThrowWhenRecentPackageRepositoryAccessed { get; set; }
 		
 		public override IRecentPackageRepository RecentPackageRepository {
 			get {
-				if (ExeptionToThrowWhenRecentPackageRepositoryAccessed != null) {
-					throw ExeptionToThrowWhenRecentPackageRepositoryAccessed;
+				if (ExceptionToThrowWhenRecentPackageRepositoryAccessed != null) {
+					throw ExceptionToThrowWhenRecentPackageRepositoryAccessed;
 				}
 				return base.RecentPackageRepository;
 			}

src/AddIns/Misc/PackageManagement/Test/Src/RecentPackagesViewModelTests.cs

@@ -143,7 +143,7 @@ namespace PackageManagement.Tests
 		public void ReadPackages_ExceptionThrownWhenAccessingActiveRepository_ErrorMessageFromExceptionNotOverriddenByReadPackagesCall()
 		{
 			var registeredRepositories = new ExceptionThrowingRegisteredPackageRepositories();
-			registeredRepositories.ExeptionToThrowWhenRecentPackageRepositoryAccessed = 
+			registeredRepositories.ExceptionToThrowWhenRecentPackageRepositoryAccessed = 
 				new Exception("Test");
 			CreateViewModel(registeredRepositories);