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

Commit 19746ab

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
2 parents 77f830a + 096c88c commit 19746ab

408 files changed

Lines changed: 2340 additions & 13170 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.

‎SharpDevelop.Tests.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ Global
313313
{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
314314
{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
315315
{B2BBC7BC-837C-40ED-A6DB-D5AE8626212F}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
316+
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
317+
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
318+
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
319+
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
316320
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
317321
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU
318322
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -641,10 +645,6 @@ Global
641645
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
642646
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
643647
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
644-
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.ActiveCfg = net_4_5_Debug|Any CPU
645-
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Debug|Any CPU.Build.0 = net_4_5_Debug|Any CPU
646-
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.ActiveCfg = net_4_5_Release|Any CPU
647-
{2A705FC6-1A9E-4941-9E47-254D79F2D9D5}.Release|Any CPU.Build.0 = net_4_5_Release|Any CPU
648648
EndGlobalSection
649649
GlobalSection(SolutionProperties) = preSolution
650650
HideSolutionNode = FALSE

‎buildsamples.bat‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@rem /p:AdditionalBuildProperties="/v:d /p:MSBuildTargetsVerbose=true"
2+
%windir%\microsoft.net\framework\v4.0.30319\msbuild src\Automated.proj /t:buildsamples /p:ArtefactsOutputDir="%CD%\build" /p:TestReportsDir="%CD%\build"
3+
@IF %ERRORLEVEL% NEQ 0 GOTO err
4+
@exit /B 0
5+
:err
6+
@PAUSE
7+
@exit /B 1

‎data/templates/project/CSharp/SharpDevelopAddin.xpt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
url = ""
4141
description = "TODO: Put description here">
4242
43+
<Manifest>
44+
<Identity name="${ProjectName}" />
45+
</Manifest>
46+
4347
<Runtime>
4448
<Import assembly = "${ProjectName}.dll"/>
4549
</Runtime>
@@ -50,6 +54,22 @@
5054
</Path>
5155
-->
5256
</AddIn>
57+
]]></File>
58+
<File name="${ProjectName}.nuspec"><![CDATA[<?xml version="1.0"?>
59+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
60+
<metadata>
61+
<id>${ProjectName}</id>
62+
<version>1.0.0.0</version>
63+
<authors>${USER}</authors>
64+
<owners>${USER}</owners>
65+
<projectUrl>TODO Put project web URL here</projectUrl>
66+
<description>TODO: Put description here</description>
67+
<tags>TODO: Put tags here</tags>
68+
</metadata>
69+
<files>
70+
<file src="bin\Release\${ProjectName}.addin" target="" />
71+
</files>
72+
</package>
5373
]]></File>
5474
<File name="Configuration/AssemblyInfo.cs" src="DefaultAssemblyInfo.cs"/>
5575
<File name="AddInWritingHelp.txt" src="..\AddInWritingHelp.txt"/>

‎doc/Dependencies.html‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,36 @@
3434
<a href="http://wixtoolset.org/">WiX</a> for building installers.
3535
</li>
3636
</ul>
37+
38+
<p>
39+
<strong>We highly recommend installing the matching SDK(s) for the .NET version(s) you are targeting:</strong>
40+
</p>
41+
42+
<table>
43+
<tr>
44+
<th style="width:250px">Target platform</th>
45+
<th>Reference Assemblies</th>
46+
<tr>
47+
<tr>
48+
<td>.NET Framework 4.5.1</td>
49+
<td><a href="http://www.microsoft.com/en-us/download/details.aspx?id=40772">Microsoft .NET Framework 4.5.1 Developer Pack</a></td>
50+
</tr>
51+
<tr>
52+
<td>.NET Framework 4.5</td>
53+
<td><a href="http://msdn.microsoft.com/en-us/windows/hardware/hh852363.aspx">Microsoft Windows SDK for Windows 8</a> (*)</td>
54+
</tr>
55+
<tr>
56+
<td>.NET Framework 4.0</td>
57+
<td><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></td>
58+
</tr>
59+
<tr>
60+
<td>.NET Framework 3.5 SP1 and below</td>
61+
<td>Included with .NET framework</td>
62+
</tr>
63+
</table>
64+
65+
<p>
66+
(*) Intellisense documentation files not available without Visual Studio; SharpDevelop will fall back to documentation from other .NET versions for .NET 4.5.0 projects.
67+
</p>
3768
</body>
3869
</html>

‎samples/AvalonEdit.Sample/AvalonEdit.Sample.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
<OutputType>WinExe</OutputType>
88
<RootNamespace>AvalonEdit.Sample</RootNamespace>
99
<AssemblyName>AvalonEdit.Sample</AssemblyName>
10-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
12+
<TargetFrameworkProfile />
1213
</PropertyGroup>
1314
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
1415
<PlatformTarget>x86</PlatformTarget>
@@ -36,6 +37,9 @@
3637
<Reference Include="ICSharpCode.AvalonEdit">
3738
<HintPath>..\..\bin\ICSharpCode.AvalonEdit.dll</HintPath>
3839
</Reference>
40+
<Reference Include="ICSharpCode.NRefactory">
41+
<HintPath>..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
42+
</Reference>
3943
<Reference Include="PresentationCore">
4044
<RequiredTargetFramework>3.0</RequiredTargetFramework>
4145
</Reference>
@@ -100,5 +104,8 @@
100104
<ItemGroup>
101105
<EmbeddedResource Include="CustomHighlighting.xshd" />
102106
</ItemGroup>
107+
<ItemGroup>
108+
<None Include="app.config" />
109+
</ItemGroup>
103110
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
104111
</Project>

‎samples/AvalonEdit.Sample/AvalonEdit.Sample.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4+
# SharpDevelop 5.0
45
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.Sample", "AvalonEdit.Sample.csproj", "{13A5B497-BA12-45AE-9033-22620C3153FB}"
56
EndProject
67
Global

‎samples/AvalonEdit.Sample/BraceFoldingStrategy.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
using System.Collections.Generic;
2121
using ICSharpCode.AvalonEdit.Document;
2222
using ICSharpCode.AvalonEdit.Folding;
23+
using ICSharpCode.NRefactory.Editor;
2324

2425
namespace AvalonEdit.Sample
2526
{
2627
/// <summary>
2728
/// Allows producing foldings from a document based on braces.
2829
/// </summary>
29-
public class BraceFoldingStrategy : AbstractFoldingStrategy
30+
public class BraceFoldingStrategy
3031
{
3132
/// <summary>
3233
/// Gets/Sets the opening brace. The default value is '{'.
@@ -47,10 +48,17 @@ public BraceFoldingStrategy()
4748
this.ClosingBrace = '}';
4849
}
4950

51+
public void UpdateFoldings(FoldingManager manager, TextDocument document)
52+
{
53+
int firstErrorOffset;
54+
IEnumerable<NewFolding> newFoldings = CreateNewFoldings(document, out firstErrorOffset);
55+
manager.UpdateFoldings(newFoldings, firstErrorOffset);
56+
}
57+
5058
/// <summary>
5159
/// Create <see cref="NewFolding"/>s for the specified document.
5260
/// </summary>
53-
public override IEnumerable<NewFolding> CreateNewFoldings(TextDocument document, out int firstErrorOffset)
61+
public IEnumerable<NewFolding> CreateNewFoldings(TextDocument document, out int firstErrorOffset)
5462
{
5563
firstErrorOffset = -1;
5664
return CreateNewFoldings(document);

‎samples/AvalonEdit.Sample/MyCompletionData.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using ICSharpCode.AvalonEdit.CodeCompletion;
2121
using ICSharpCode.AvalonEdit.Document;
2222
using ICSharpCode.AvalonEdit.Editing;
23+
using ICSharpCode.NRefactory.Editor;
2324

2425
namespace AvalonEdit.Sample
2526
{

‎samples/AvalonEdit.Sample/Window1.xaml.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Window1()
6565

6666
DispatcherTimer foldingUpdateTimer = new DispatcherTimer();
6767
foldingUpdateTimer.Interval = TimeSpan.FromSeconds(2);
68-
foldingUpdateTimer.Tick += foldingUpdateTimer_Tick;
68+
foldingUpdateTimer.Tick += delegate { UpdateFoldings(); };
6969
foldingUpdateTimer.Start();
7070
}
7171

@@ -147,7 +147,7 @@ void textEditor_TextArea_TextEntering(object sender, TextCompositionEventArgs e)
147147

148148
#region Folding
149149
FoldingManager foldingManager;
150-
AbstractFoldingStrategy foldingStrategy;
150+
object foldingStrategy;
151151

152152
void HighlightingComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
153153
{
@@ -175,7 +175,7 @@ void HighlightingComboBox_SelectionChanged(object sender, SelectionChangedEventA
175175
if (foldingStrategy != null) {
176176
if (foldingManager == null)
177177
foldingManager = FoldingManager.Install(textEditor.TextArea);
178-
foldingStrategy.UpdateFoldings(foldingManager, textEditor.Document);
178+
UpdateFoldings();
179179
} else {
180180
if (foldingManager != null) {
181181
FoldingManager.Uninstall(foldingManager);
@@ -184,10 +184,13 @@ void HighlightingComboBox_SelectionChanged(object sender, SelectionChangedEventA
184184
}
185185
}
186186

187-
void foldingUpdateTimer_Tick(object sender, EventArgs e)
187+
void UpdateFoldings()
188188
{
189-
if (foldingStrategy != null) {
190-
foldingStrategy.UpdateFoldings(foldingManager, textEditor.Document);
189+
if (foldingStrategy is BraceFoldingStrategy) {
190+
((BraceFoldingStrategy)foldingStrategy).UpdateFoldings(foldingManager, textEditor.Document);
191+
}
192+
if (foldingStrategy is XmlFoldingStrategy) {
193+
((XmlFoldingStrategy)foldingStrategy).UpdateFoldings(foldingManager, textEditor.Document);
191194
}
192195
}
193196
#endregion

‎samples/AvalonEdit.Sample/app.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5+
</startup>
6+
</configuration>

0 commit comments

Comments
 (0)