Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit 34e6970

Browse files
PeterForstmeierPeterForstmeier
committed
Merge branch 'master' of github.com:icsharpcode/SharpDevelop
2 parents f5d1100 + d3a4477 commit 34e6970

13 files changed

Lines changed: 191 additions & 93 deletions

File tree

‎README.md‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
# #develop (short for SharpDevelop)
2+
3+
##Overview
4+
5+
#develop is a free Integrated Development Environment
6+
(IDE) for C#, VB.NET, Boo, IronPython, IronRuby and F# projects on Microsoft's
7+
.NET platform. It is written (almost) entirely in C#, and comes with features
8+
you would expect in an IDE plus a few more.
9+
10+
The #develop project started on September 11th, 2000. The project was initiated
11+
by Mike Krüger. In the course of the project, several contributors joined in.
12+
If you want to contribute see ["Joining the team"](https://github.com/icsharpcode/SharpDevelop/wiki/Joining-the-Team).
13+
14+
1. [Official Website](http://www.icsharpcode.net/OpenSource/SD/Default.aspx)
15+
2. [Forums](http://community.sharpdevelop.net/forums/)
16+
3. [Build Artefacts (Nightly Builds)](http://build.sharpdevelop.net/BuildArtefacts)
17+
18+
##How To Compile
19+
#Develop can be compiled using the supplied .bat files, or in #Develop itself.
20+
21+
##System Requirements (running #Develop)
22+
23+
- Windows Vista or higher.
24+
- [.NET 4.5](http://www.microsoft.com/en-au/download/details.aspx?id=30653)
25+
- [Visual C++ 2008 SP1 Runtime](http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2&displaylang=en)
26+
27+
##Extended Requirements (building #Develop)
28+
29+
- [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22)
30+
- [.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))
31+
- Windows SDK 7.1 (?? not sure if this still is necessary...)
32+
- Windows SDK 7.0 (optional; C++ compiler needed for profiler)
33+
- [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595)
34+
- [SD Git Repository](https://github.com/icsharpcode/SharpDevelop.git)
35+
36+
##Libraries and Integrated tools:
37+
38+
* [Avalon Dock](http://avalondock.codeplex.com/) : New BSD License (BSD) (thanks to **Adolfo Marinucci**)
39+
* [Graph#](https://graphsharp.codeplex.com/)
40+
* [IQToolkit](https://iqtoolkit.codeplex.com/)
41+
* [Irony](https://irony.codeplex.com/)
42+
* [ITextSharp](http://sourceforge.net/projects/itextsharp/)
43+
* [log4Net](https://github.com/apache/log4net)
44+
* Mono T4
45+
* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**) -
46+
* [Sharp Svn](https://sharpsvn.open.collab.net/)
47+
* [SQLite](https://sqlite.org/)
48+
* [WPFToolkit](https://wpf.codeplex.com/)
49+
50+
##Integrated Tools (packaged with #Develop):
51+
52+
* [IronPython](http://ironpython.net/)
53+
* [IronRuby](https://ironruby.codeplex.com/)
54+
* [NuGet](https://nuget.codeplex.com/)
55+
* [NUnit](http://www.nunit.org/)
56+
* [OpenCover](https://github.com/OpenCover/opencover)
57+
* [WiX](https://wix.codeplex.com/)
58+
59+
##Reusable Libraries (Part of #Develop):
60+
61+
* [AvalonEdit](https://github.com/icsharpcode/SharpDevelop/wiki/AvalonEdit)
62+
* Debugger.Core
63+
* [ICSharpCode.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Main/Core)
64+
* [ICSharpCode.Decompiler](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/ICSharpCode.Decompiler)
65+
* [NRefactory](https://github.com/icsharpcode/NRefactory)
66+
* [SharpTreeView](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/SharpTreeView)
67+
* [WPF Designer]( https://github.com/icsharpcode/SharpDevelop/tree/master/src/AddIns/DisplayBindings/WpfDesign)
68+
69+
## #Develop Contributors
70+
71+
###Developers
72+
73+
* [Mike Krüger](https://github.com/mkrueger) (Project Founder)
74+
* [Daniel Grunwald](https://github.com/dgrunwald) (Technical Lead)
75+
* [Andreas Weizel](https://github.com/Rpinski)
76+
* [Matt Ward](https://github.com/mrward)
77+
* [David Srbecky](https://github.com/dsrbecky)(Debugger)
78+
* [Siegfried Pammer](https://github.com/siegfriedpammer)
79+
* [Peter Forstmeier]( https://github.com/PeterForstmeier)(#Develop Reports)
80+
81+
###Non-Developers
82+
83+
* Christoph Wille (PM)
84+
* Bernhard Spuida (Kalfaktor)
85+
86+
###Past Developers (Non-Exhaustive List)
87+
88+
* [Mike Krüger](https://github.com/mkrueger) (Project Founder)
89+
* Alexandre Semenov
90+
* Andrea Paatz
91+
* Christian Hornung
92+
* David Alpert
93+
* Denis ERCHOFF
94+
* Dickon Field
95+
* Georg Brandl
96+
* Ifko Kovacka
97+
* Itai Bar-Haim
98+
* Ivan Shumilin
99+
* John Reilly
100+
* John Simons
101+
* Justin Dearing
102+
* Markus Palme
103+
* Mathias Simmack
104+
* Matt Everson
105+
* Nathan Allan
106+
* Nikola Kavaldjiev
107+
* Philipp Maihart
108+
* Poul Staugaard
109+
* Robert Pickering
110+
* Robert Zaunere
111+
* Roman Taranchenko
112+
* Russell Wilkins
113+
* Scott Ferrett
114+
* Sergej Andrejev
115+
* Shinsaku Nakagawa
116+
* Tomasz Tretkowski
117+
* Troy Simpson
118+
119+
######Copyright 2014 AlphaSierraPapa for the SharpDevelop team. SharpDevelop is distributed under the MIT license.

‎README.txt‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,21 @@ public override void Run()
5454
}
5555
}
5656

57+
public class ExpandAllTestsCommand : AbstractMenuCommand
58+
{
59+
public override void Run()
60+
{
61+
if (!(this.Owner is SharpTreeView))
62+
return;
63+
64+
var treeView = (SharpTreeView)this.Owner;
65+
if (treeView.Root != null) {
66+
foreach (var n in treeView.Root.Descendants())
67+
n.IsExpanded = true;
68+
}
69+
}
70+
}
71+
5772
public class CollapseAllTestsCommand : AbstractMenuCommand
5873
{
5974
public override void Run()

‎src/AddIns/Analysis/UnitTesting/UnitTesting.addin‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@
100100
tooltip="${res:NUnitPad.NUnitPadContent.ReferenceItem}"
101101
class="ICSharpCode.UnitTesting.AddNUnitReferenceCommand"/>
102102
<ToolbarItem id = "CollapseSeparator" type = "Separator"/>
103+
<ToolbarItem id = "ExpandAll"
104+
icon = "Icons.16x16.OpenCollection"
105+
tooltip = "${res:MainWindow.Windows.SearchResultPanel.ExpandAll.ToolTip}"
106+
class = "ICSharpCode.UnitTesting.ExpandAllTestsCommand"/>
103107
<ToolbarItem id = "Collapse"
104108
icon = "Icons.16x16.Collection"
105109
tooltip = "${res:MainWindow.Windows.SearchResultPanel.CollapseAll.ToolTip}"

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,21 @@ void LoadSolutionProjectsThreadFinished(object sender, EventArgs e)
141141

142142
void CaretLocationChanged(object sender, EventArgs e)
143143
{
144+
if (caretMovementTokenSource != null)
145+
caretMovementTokenSource.Cancel();
144146
timer.Stop();
145147
timer.Start();
146148
}
147149

148-
void ResolveAtCaret()
150+
async void ResolveAtCaret()
149151
{
150152
timer.Stop();
151-
if (caretMovementTokenSource != null)
152-
caretMovementTokenSource.Cancel();
153153
caretMovementTokenSource = new CancellationTokenSource();
154-
var rr = SD.ParserService.Resolve(editor.FileName, editor.Caret.Location, editor.Document, cancellationToken: caretMovementTokenSource.Token);
155-
SetCurrentSymbol(rr.GetSymbol());
154+
try {
155+
var rr = await SD.ParserService.ResolveAsync(editor.FileName, editor.Caret.Location, editor.Document, cancellationToken: caretMovementTokenSource.Token);
156+
SetCurrentSymbol(rr.GetSymbol());
157+
} catch (OperationCanceledException) {
158+
}
156159
}
157160

158161
IResolveVisitorNavigator InitNavigator(ICompilation compilation)
@@ -199,7 +202,7 @@ void FindCurrentReferences(int start, int end)
199202
void VisitVisibleNodes(AstNode node, IResolveVisitorNavigator currentNavigator, CSharpAstResolver resolver, int start, int end)
200203
{
201204
if (!CSharpAstResolver.IsUnresolvableNode(node))
202-
currentNavigator.Resolved(node, resolver.Resolve(node, caretMovementTokenSource.Token));
205+
currentNavigator.Resolved(node, resolver.Resolve(node));
203206
for (var child = node.FirstChild; child != null; child = child.NextSibling) {
204207
if (child.StartLocation.Line <= end && child.EndLocation.Line >= start)
205208
VisitVisibleNodes(child, currentNavigator, resolver, start, end);

‎src/AddIns/BackendBindings/FSharpBinding/FSharpInteractive.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public FSharpInteractive()
108108
string FindFSharpInteractiveInProgramFilesFolder()
109109
{
110110
var fileNames = new string [] {
111+
@"Microsoft SDKs\F#\3.1\Framework\v4.0\Fsi.exe",
111112
@"Microsoft SDKs\F#\3.0\Framework\v4.0\Fsi.exe",
112113
@"Microsoft F#\v4.0\Fsi.exe"
113114
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</PropertyGroup>
3232

3333
<Imports clear="True">
34-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
34+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
3535
</Imports>
3636

3737
<Files>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</PropertyGroup>
3232

3333
<Imports clear="True">
34-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
34+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
3535
</Imports>
3636

3737
<Files>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
using System;
2020
using System.Drawing;
21+
using System.Linq;
2122
using System.Windows.Forms;
2223

2324
using ICSharpCode.Core;
@@ -53,6 +54,7 @@ public CodonListPanel()
5354
CodonLV.Columns.Add("Codon ID", 175,HorizontalAlignment.Left);
5455
CodonLV.Columns.Add("Codon Class", 400,HorizontalAlignment.Left);
5556
CodonLV.Columns.Add("Codon Condition -> Action on Fail", 600,HorizontalAlignment.Left);
57+
CodonLV.Columns.Add("Label", 450, HorizontalAlignment.Left);
5658

5759
ExtTextBox.Text = "Extension : ";
5860
ExtTextBox.ReadOnly = true;
@@ -105,9 +107,8 @@ public void ListCodons(string path)
105107

106108
lvi.SubItems.Add(c.Properties.Contains("class") ? c.Properties["class"] : "");
107109

108-
foreach (ICondition condition in c.Conditions) {
109-
lvi.SubItems.Add(condition.Name + ", " + condition.Action);
110-
}
110+
lvi.SubItems.Add(string.Join(";", c.Conditions.Select(a => a.Name + ": " + a.Action)));
111+
lvi.SubItems.Add(c.Properties.Contains("label") ? c.Properties["label"] : "");
111112
CodonLV.Items.Add(lvi);
112113
}
113114
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ protected override void UpdateRepositoryBeforeReadPackagesTaskStarts()
6868
try {
6969
repository = RegisteredPackageRepositories.ActiveRepository;
7070
} catch (Exception ex) {
71+
repository = null;
7172
errorMessage = ex.Message;
7273
}
7374
}

0 commit comments

Comments
 (0)