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

Commit 22ff94b

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
2 parents a4c105a + e61e0fa commit 22ff94b

819 files changed

Lines changed: 3154 additions & 78291 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
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+
- [Microsoft Build Tools 2013](www.microsoft.com/en-us/download/details.aspx?id=40760)
30+
- [.NET 3.5 SP1](http://www.microsoft.com/en-au/download/details.aspx?id=22)
31+
- [.NET 4.5 SDK] (part of [Windows SDK 8.0](http://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx))
32+
- [Windows SDK 7.1](http://www.microsoft.com/downloads/details.aspx?familyid=6B6C21D2-2006-4AFA-9702-529FA782D63B) (?? not sure if this still is necessary...)
33+
- [Windows SDK 7.0](http://www.microsoft.com/en-us/download/details.aspx?id=3138) (optional; C++ compiler needed for profiler)
34+
- [Windows PowerShell](http://www.microsoft.com/en-us/download/details.aspx?id=34595)
35+
- If you have cloned the SD git repository: git must be available on your PATH
36+
37+
##Libraries and Integrated tools:
38+
39+
* [Avalon Dock](http://avalondock.codeplex.com/) : New BSD License (BSD) (thanks to **Adolfo Marinucci**)
40+
* [Graph#](https://graphsharp.codeplex.com/)
41+
* [IQToolkit](https://iqtoolkit.codeplex.com/)
42+
* [Irony](https://irony.codeplex.com/)
43+
* [ITextSharp](http://sourceforge.net/projects/itextsharp/)
44+
* [log4Net](https://github.com/apache/log4net)
45+
* Mono T4
46+
* [Mono.Cecil](https://github.com/jbevain/cecil): MIT License (thanks to **Jb Evain**)
47+
* [Sharp Svn](https://sharpsvn.open.collab.net/)
48+
* [SQLite](https://sqlite.org/)
49+
* [WPFToolkit](https://wpf.codeplex.com/)
50+
51+
##Integrated Tools (packaged with #Develop):
52+
53+
* [IronPython](http://ironpython.net/)
54+
* [IronRuby](https://ironruby.codeplex.com/)
55+
* [NuGet](https://nuget.codeplex.com/)
56+
* [NUnit](http://www.nunit.org/)
57+
* [OpenCover](https://github.com/OpenCover/opencover)
58+
* [WiX](https://wix.codeplex.com/)
59+
60+
##Reusable Libraries (Part of #Develop):
61+
62+
* [AvalonEdit](http://avalonedit.net/)
63+
* [Debugger.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/AddIns/Debugger/Debugger.Core)
64+
* [ICSharpCode.Core](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Main/Core)
65+
* [ICSharpCode.Decompiler](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/ICSharpCode.Decompiler)
66+
* [NRefactory](https://github.com/icsharpcode/NRefactory)
67+
* [SharpTreeView](https://github.com/icsharpcode/SharpDevelop/tree/master/src/Libraries/SharpTreeView)
68+
* [WPF Designer]( https://github.com/icsharpcode/SharpDevelop/tree/master/src/AddIns/DisplayBindings/WpfDesign)
69+
70+
## #Develop Contributors
71+
72+
###Developers
73+
74+
* [Mike Krüger](https://github.com/mkrueger) (Project Founder)
75+
* [Daniel Grunwald](https://github.com/dgrunwald) (Technical Lead)
76+
* [Andreas Weizel](https://github.com/Rpinski)
77+
* [Matt Ward](https://github.com/mrward)
78+
* [David Srbecky](https://github.com/dsrbecky)(Debugger)
79+
* [Siegfried Pammer](https://github.com/siegfriedpammer)
80+
* [Peter Forstmeier]( https://github.com/PeterForstmeier)(#Develop Reports)
81+
82+
###Non-Developers
83+
84+
* Christoph Wille (PM)
85+
* Bernhard Spuida (Kalfaktor)
86+
87+
###Past Developers (Non-Exhaustive List)
88+
89+
* [Mike Krüger](https://github.com/mkrueger) (Project Founder)
90+
* Alexandre Semenov
91+
* Andrea Paatz
92+
* Christian Hornung
93+
* David Alpert
94+
* Denis ERCHOFF
95+
* Dickon Field
96+
* Georg Brandl
97+
* Ifko Kovacka
98+
* Itai Bar-Haim
99+
* Ivan Shumilin
100+
* John Reilly
101+
* John Simons
102+
* Justin Dearing
103+
* Markus Palme
104+
* Mathias Simmack
105+
* Matt Everson
106+
* Nathan Allan
107+
* Nikola Kavaldjiev
108+
* Philipp Maihart
109+
* Poul Staugaard
110+
* Robert Pickering
111+
* Robert Zaunere
112+
* Roman Taranchenko
113+
* Russell Wilkins
114+
* Scott Ferrett
115+
* Sergej Andrejev
116+
* Shinsaku Nakagawa
117+
* Tomasz Tretkowski
118+
* Troy Simpson
119+
120+
######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.

SharpDevelop.Tests.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Wi
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker120", "src\Main\ICSharpCode.SharpDevelop.BuildWorker120\ICSharpCode.SharpDevelop.BuildWorker120.csproj", "{6F273DA5-E10C-45A6-9071-7313ECD98C90}"
30+
EndProject
2931
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}"
3032
EndProject
3133
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
@@ -280,6 +282,10 @@ Global
280282
{1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU
281283
{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU
282284
{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU
285+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
286+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU
287+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU
288+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU
283289
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
284290
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
285291
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
@@ -647,6 +653,7 @@ Global
647653
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
648654
{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
649655
{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
656+
{6F273DA5-E10C-45A6-9071-7313ECD98C90} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
650657
{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
651658
{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
652659
{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}

SharpDevelop.sln

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Wi
2222
EndProject
2323
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDevelop", "src\Main\SharpDevelop\SharpDevelop.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
2424
EndProject
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker120", "src\Main\ICSharpCode.SharpDevelop.BuildWorker120\ICSharpCode.SharpDevelop.BuildWorker120.csproj", "{6F273DA5-E10C-45A6-9071-7313ECD98C90}"
26+
EndProject
2527
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2A232EF1-EB95-41C6-B63A-C106E0C95D3C}"
2628
EndProject
2729
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
@@ -229,6 +231,10 @@ Global
229231
{1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU
230232
{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU
231233
{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU
234+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
235+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Debug|Any CPU.Build.0 = Debug|Any CPU
236+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.ActiveCfg = Release|Any CPU
237+
{6F273DA5-E10C-45A6-9071-7313ECD98C90}.Release|Any CPU.Build.0 = Release|Any CPU
232238
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU
233239
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU
234240
{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = net_4_0_Release|Any CPU
@@ -373,6 +379,10 @@ Global
373379
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
374380
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
375381
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
382+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
383+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
384+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
385+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
376386
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
377387
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU
378388
{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -497,10 +507,6 @@ Global
497507
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
498508
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
499509
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
500-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
501-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
502-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
503-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
504510
EndGlobalSection
505511
GlobalSection(SolutionProperties) = preSolution
506512
HideSolutionNode = FALSE
@@ -514,6 +520,7 @@ Global
514520
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
515521
{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
516522
{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
523+
{6F273DA5-E10C-45A6-9071-7313ECD98C90} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
517524
{D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
518525
{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
519526
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}

clean.bat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
1+
@set PROGFILES=%PROGRAMFILES%
2+
@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
3+
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
24
@IF %ERRORLEVEL% NEQ 0 PAUSE
3-
%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
5+
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
46
@IF %ERRORLEVEL% NEQ 0 PAUSE

data/resources/StringResources.resx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6054,6 +6054,10 @@ Removed the end part of the original message ", reason '${Message}'" since this
60546054
<data name="ProjectComponent.ContextMenu.AddReference" xml:space="preserve">
60556055
<value>Add Reference</value>
60566056
</data>
6057+
<data name="ProjectComponent.ContextMenu.AddServiceReference" xml:space="preserve">
6058+
<value>Add Service Reference</value>
6059+
<comment>Right click context menu option to add a service reference to the project.</comment>
6060+
</data>
60576061
<data name="ProjectComponent.ContextMenu.AddWebReference" xml:space="preserve">
60586062
<value>Add Web Reference</value>
60596063
<comment>Right click context menu option to add a web reference to the project.</comment>
@@ -6972,6 +6976,9 @@ The resources files have been renamed/moved accordingly.</value>
69726976
<data name="StartPage.StartMenu.OpenCombineButton" xml:space="preserve">
69736977
<value>Open solution</value>
69746978
</data>
6979+
<data name="StartPage.StartMenu.RemoveRecentProject" xml:space="preserve">
6980+
<value>Remove from recent projects list</value>
6981+
</data>
69756982
<data name="StartPage.StartPageContentName" xml:space="preserve">
69766983
<value>Start Page</value>
69776984
</data>

debugbuild.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU"
1+
@set PROGFILES=%PROGRAMFILES%
2+
@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
3+
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU" %*
24
@IF %ERRORLEVEL% NEQ 0 GOTO err
35
@exit /B 0
46
:err

doc/Dependencies.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
<td style="padding-right: 8px;">.NET Framework 3.5 SP1 and below</td>
6464
<td>Included with .NET framework</td>
6565
</tr>
66+
<tr>
67+
<td>.NET Portable Class Libraries</td>
68+
<td><a href="http://visualstudiogallery.msdn.microsoft.com/b0e0b5e9-e138-410b-ad10-00cb3caf4981/">Portable Library Tools - Install with the /buildmachine switch</a></td>
69+
</tr>
6670
</table>
6771

6872
<p>

releasebuild.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU"
1+
@set PROGFILES=%PROGRAMFILES%
2+
@if exist "%PROGRAMFILES(x86)%" set PROGFILES=%PROGRAMFILES(x86)%
3+
"%PROGFILES%\MSBuild\12.0\Bin\msbuild" /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU" %*
24
@IF %ERRORLEVEL% NEQ 0 GOTO err
35
@exit /B 0
46
:err

src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<AddIn name = "CodeCoverageAddIn"
1+
<AddIn name = "CodeCoverage AddIn"
22
author = "Matt Ward"
33
copyright = "prj:///doc/copyright.txt"
44
description = "Code Coverage AddIn for SharpDevelop using OpenCover"

0 commit comments

Comments
 (0)