Skip to content

Commit bbf1c22

Browse files
KindDragonKindDragon
committedOct 2, 2012
Projects converted to VS 2012 and .Net 4
1 parent 6e59f25 commit bbf1c22

12 files changed

+21917
-37
lines changed
 

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
*.user
2+
*.suo
3+
_ReSharper.*/
4+
bin/
5+
obj/
6+
TestResults/

‎ICSharpCode.TextEditor.sln

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 9.00
2-
# Visual Studio 2005
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 2012
33
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor.Tests", "Test\ICSharpCode.TextEditor.Tests.csproj", "{6259D767-BA7C-484D-9472-68F350A20086}"
44
EndProject
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
@@ -10,14 +10,14 @@ Global
1010
Release|Any CPU = Release|Any CPU
1111
EndGlobalSection
1212
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{6259D767-BA7C-484D-9472-68F350A20086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{6259D767-BA7C-484D-9472-68F350A20086}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{6259D767-BA7C-484D-9472-68F350A20086}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{6259D767-BA7C-484D-9472-68F350A20086}.Release|Any CPU.Build.0 = Release|Any CPU
1713
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1814
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
1915
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
2016
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
17+
{6259D767-BA7C-484D-9472-68F350A20086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18+
{6259D767-BA7C-484D-9472-68F350A20086}.Debug|Any CPU.Build.0 = Debug|Any CPU
19+
{6259D767-BA7C-484D-9472-68F350A20086}.Release|Any CPU.ActiveCfg = Release|Any CPU
20+
{6259D767-BA7C-484D-9472-68F350A20086}.Release|Any CPU.Build.0 = Release|Any CPU
2121
EndGlobalSection
2222
GlobalSection(SolutionProperties) = preSolution
2323
HideSolutionNode = FALSE

‎Project/Configuration/GlobalAssemblyInfo.cs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// <file>
2+
// <copyright see="prj:///doc/copyright.txt"/>
3+
// <license see="prj:///doc/license.txt"/>
4+
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
5+
// <version>$Revision: 1040 $</version>
6+
// </file>
7+
8+
/////////////////////////////////////////////////////////////////////////////////////////////
9+
/////////////////////////////////////////////////////////////////////////////////////////////
10+
// //
11+
// DO NOT EDIT GlobalAssemblyInfo.cs, it is recreated using AssemblyInfo.template whenever //
12+
// StartUp is compiled. //
13+
// //
14+
/////////////////////////////////////////////////////////////////////////////////////////////
15+
/////////////////////////////////////////////////////////////////////////////////////////////
16+
17+
using System.Resources;
18+
using System.Reflection;
19+
20+
[assembly: System.Runtime.InteropServices.ComVisible(false)]
21+
[assembly: AssemblyCompany("ic#code")]
22+
[assembly: AssemblyProduct("SharpDevelop")]
23+
[assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
24+
[assembly: AssemblyVersion(RevisionClass.FullVersion)]
25+
[assembly: NeutralResourcesLanguage("en-US")]
26+
27+
internal static class RevisionClass
28+
{
29+
public const string Major = "3";
30+
public const string Minor = "2";
31+
public const string Build = "2";
32+
public const string Revision = "6466";
33+
34+
public const string MainVersion = Major + "." + Minor;
35+
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
36+
}

‎Project/ICSharpCode.TextEditor.csproj

+45-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,39 +21,56 @@
2021
<BaseAddress>98041856</BaseAddress>
2122
<PlatformTarget>AnyCPU</PlatformTarget>
2223
<FileAlignment>4096</FileAlignment>
23-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
24+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
25+
<FileUpgradeFlags>
26+
</FileUpgradeFlags>
27+
<UpgradeBackupLocation>
28+
</UpgradeBackupLocation>
29+
<OldToolsVersion>3.5</OldToolsVersion>
30+
<PublishUrl>publish\</PublishUrl>
31+
<Install>true</Install>
32+
<InstallFrom>Disk</InstallFrom>
33+
<UpdateEnabled>false</UpdateEnabled>
34+
<UpdateMode>Foreground</UpdateMode>
35+
<UpdateInterval>7</UpdateInterval>
36+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
37+
<UpdatePeriodically>false</UpdatePeriodically>
38+
<UpdateRequired>false</UpdateRequired>
39+
<MapFileExtensions>true</MapFileExtensions>
40+
<ApplicationRevision>0</ApplicationRevision>
41+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
42+
<IsWebBootstrapper>false</IsWebBootstrapper>
43+
<UseApplicationTrust>false</UseApplicationTrust>
44+
<BootstrapperEnabled>true</BootstrapperEnabled>
45+
<TargetFrameworkProfile />
2446
</PropertyGroup>
2547
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2648
<Optimize>False</Optimize>
2749
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
2850
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
29-
<OutputPath>..\..\..\..\bin\</OutputPath>
51+
<OutputPath>bin\</OutputPath>
3052
<DefineConstants>DEBUG;DATACONSISTENCYTEST</DefineConstants>
3153
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
3254
<CodeAnalysisRules>-Microsoft.Design#CA1012;-Microsoft.Design#CA2210;-Microsoft.Design#CA1040;-Microsoft.Design#CA1005;-Microsoft.Design#CA1020;-Microsoft.Design#CA1021;-Microsoft.Design#CA1010;-Microsoft.Design#CA1011;-Microsoft.Design#CA1009;-Microsoft.Design#CA1050;-Microsoft.Design#CA1026;-Microsoft.Design#CA1019;-Microsoft.Design#CA1031;-Microsoft.Design#CA1047;-Microsoft.Design#CA1000;-Microsoft.Design#CA1048;-Microsoft.Design#CA1051;-Microsoft.Design#CA1002;-Microsoft.Design#CA1061;-Microsoft.Design#CA1006;-Microsoft.Design#CA1046;-Microsoft.Design#CA1045;-Microsoft.Design#CA1038;-Microsoft.Design#CA1008;-Microsoft.Design#CA1028;-Microsoft.Design#CA1004;-Microsoft.Design#CA1035;-Microsoft.Design#CA1063;-Microsoft.Design#CA1032;-Microsoft.Design#CA1023;-Microsoft.Design#CA1033;-Microsoft.Design#CA1039;-Microsoft.Design#CA1016;-Microsoft.Design#CA1014;-Microsoft.Design#CA1017;-Microsoft.Design#CA1018;-Microsoft.Design#CA1027;-Microsoft.Design#CA1059;-Microsoft.Design#CA1060;-Microsoft.Design#CA1034;-Microsoft.Design#CA1013;-Microsoft.Design#CA1036;-Microsoft.Design#CA1044;-Microsoft.Design#CA1041;-Microsoft.Design#CA1025;-Microsoft.Design#CA1052;-Microsoft.Design#CA1053;-Microsoft.Design#CA1057;-Microsoft.Design#CA1058;-Microsoft.Design#CA1001;-Microsoft.Design#CA1049;-Microsoft.Design#CA1054;-Microsoft.Design#CA1056;-Microsoft.Design#CA1055;-Microsoft.Design#CA1030;-Microsoft.Design#CA1003;-Microsoft.Design#CA1007;-Microsoft.Design#CA1043;-Microsoft.Design#CA1024;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1301;-Microsoft.Globalization#CA1302;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1306;-Microsoft.Globalization#CA1304;-Microsoft.Globalization#CA1305;-Microsoft.Globalization#CA1300;-Microsoft.Mobility#CA1600;-Microsoft.Mobility#CA1601;-Microsoft.Naming#CA1718;-Microsoft.Naming#CA1720;-Microsoft.Naming#CA1700;-Microsoft.Naming#CA1712;-Microsoft.Naming#CA1713;-Microsoft.Naming#CA1709;-Microsoft.Naming#CA1708;-Microsoft.Naming#CA1715;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1707;-Microsoft.Naming#CA1722;-Microsoft.Naming#CA1711;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1705;-Microsoft.Naming#CA1725;-Microsoft.Naming#CA1719;-Microsoft.Naming#CA1721;-Microsoft.Naming#CA1706;-Microsoft.Naming#CA1724;-Microsoft.Naming#CA1726;-Microsoft.Performance#CA1809;-Microsoft.Performance#CA1811;-Microsoft.Performance#CA1812;-Microsoft.Performance#CA1807;-Microsoft.Performance#CA1813;-Microsoft.Performance#CA1823;-Microsoft.Performance#CA1816;-Microsoft.Performance#CA1817;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1818;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810;-Microsoft.Performance#CA1822;-Microsoft.Performance#CA1815;-Microsoft.Performance#CA1814;-Microsoft.Performance#CA1819;-Microsoft.Performance#CA1804;-Microsoft.Performance#CA1820;-Microsoft.Performance#CA1802;-Microsoft.Security#CA2116;-Microsoft.Security#CA2117;-Microsoft.Security#CA2105;-Microsoft.Security#CA2115;-Microsoft.Security#CA2104;-Microsoft.Security#CA2122;-Microsoft.Security#CA2114;-Microsoft.Security#CA2123;-Microsoft.Security#CA2111;-Microsoft.Security#CA2108;-Microsoft.Security#CA2107;-Microsoft.Security#CA2103;-Microsoft.Security#CA2100;-Microsoft.Security#CA2118;-Microsoft.Security#CA2109;-Microsoft.Security#CA2119;-Microsoft.Security#CA2106;-Microsoft.Security#CA2112;-Microsoft.Security#CA2110;-Microsoft.Security#CA2120;-Microsoft.Security#CA2101;-Microsoft.Security#CA2121;-Microsoft.Security#CA2126;-Microsoft.Security#CA2124;-Microsoft.Usage#CA2209;-Microsoft.Usage#CA2236;-Microsoft.Usage#CA2227;-Microsoft.Usage#CA2213;-Microsoft.Usage#CA2216;-Microsoft.Usage#CA2215;-Microsoft.Usage#CA2214;-Microsoft.Usage#CA2222;-Microsoft.Usage#CA2202;-Microsoft.Usage#CA1806;-Microsoft.Usage#CA2217;-Microsoft.Usage#CA2212;-Microsoft.Usage#CA2219;-Microsoft.Usage#CA2201;-Microsoft.Usage#CA2228;-Microsoft.Usage#CA2221;-Microsoft.Usage#CA2220;-Microsoft.Usage#CA2240;-Microsoft.Usage#CA2229;-Microsoft.Usage#CA2238;-Microsoft.Usage#CA2207;-Microsoft.Usage#CA2208;-Microsoft.Usage#CA2235;-Microsoft.Usage#CA2237;-Microsoft.Usage#CA2232;-Microsoft.Usage#CA2223;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2233;-Microsoft.Usage#CA2225;-Microsoft.Usage#CA2226;-Microsoft.Usage#CA2231;-Microsoft.Usage#CA2224;-Microsoft.Usage#CA2218;-Microsoft.Usage#CA2234;-Microsoft.Usage#CA2241;-Microsoft.Usage#CA2239;-Microsoft.Usage#CA2200;-Microsoft.Usage#CA1801;-Microsoft.Usage#CA2205;-Microsoft.Usage#CA2230</CodeAnalysisRules>
55+
<DebugType>full</DebugType>
3356
</PropertyGroup>
3457
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3558
<Optimize>True</Optimize>
3659
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
3760
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
38-
<OutputPath>..\..\..\..\bin\</OutputPath>
61+
<OutputPath>bin\</OutputPath>
3962
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
40-
</PropertyGroup>
41-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
42-
<DebugType>Full</DebugType>
63+
<DebugType>pdbonly</DebugType>
4364
<DebugSymbols>true</DebugSymbols>
4465
</PropertyGroup>
45-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
46-
<DebugType>None</DebugType>
47-
<DebugSymbols>False</DebugSymbols>
48-
</PropertyGroup>
4966
<ItemGroup>
5067
<Reference Include="System" />
5168
<Reference Include="System.Drawing" />
5269
<Reference Include="System.Windows.Forms" />
5370
<Reference Include="System.Xml" />
5471
</ItemGroup>
5572
<ItemGroup>
73+
<Compile Include="Configuration\GlobalAssemblyInfo.cs" />
5674
<Compile Include="Src\Document\DefaultDocument.cs" />
5775
<Compile Include="Src\Document\DocumentEventArgs.cs" />
5876
<Compile Include="Src\Document\DocumentFactory.cs" />
@@ -137,7 +155,7 @@
137155
<Compile Include="Src\Document\ITextEditorProperties.cs" />
138156
<Compile Include="Src\Gui\Caret.cs" />
139157
<Compile Include="Src\Gui\TextArea.cs">
140-
<SubType>UserControl</SubType>
158+
<SubType>Component</SubType>
141159
</Compile>
142160
<Compile Include="Src\Gui\TextEditorControl.cs">
143161
<SubType>UserControl</SubType>
@@ -179,7 +197,7 @@
179197
</Compile>
180198
<Compile Include="Src\Gui\BrushRegistry.cs" />
181199
<Compile Include="Src\Gui\HRuler.cs">
182-
<SubType>UserControl</SubType>
200+
<SubType>Component</SubType>
183201
</Compile>
184202
<Compile Include="Src\Document\BookmarkManager\Bookmark.cs" />
185203
<Compile Include="Src\Document\BookmarkManager\BookmarkEventHandler.cs" />
@@ -205,15 +223,25 @@
205223
<EmbeddedResource Include="Resources\Boo.xshd" />
206224
<Compile Include="Src\Gui\DrawableLine.cs" />
207225
<Compile Include="Src\Gui\ToolTipRequestEventArgs.cs" />
208-
<Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
209-
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
210-
</Compile>
211226
<Compile Include="Src\Document\HighlightingStrategy\SpanStack.cs" />
212227
<Compile Include="Src\Util\WeakCollection.cs" />
213228
<EmbeddedResource Include="Resources\Patch-Mode.xshd" />
214229
</ItemGroup>
230+
<ItemGroup>
231+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
232+
<Visible>False</Visible>
233+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
234+
<Install>false</Install>
235+
</BootstrapperPackage>
236+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
237+
<Visible>False</Visible>
238+
<ProductName>.NET Framework 3.5 SP1</ProductName>
239+
<Install>true</Install>
240+
</BootstrapperPackage>
241+
</ItemGroup>
215242
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
216243
<PropertyGroup>
217-
<PreBuildEvent>..\src\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe</PreBuildEvent>
244+
<PreBuildEvent>
245+
</PreBuildEvent>
218246
</PropertyGroup>
219247
</Project>

‎Test/ICSharpCode.TextEditor.Tests.csproj

+18-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,26 +21,22 @@
2021
<Optimize>False</Optimize>
2122
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
2223
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25-
<DebugSymbols>true</DebugSymbols>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugSymbols>true</DebugSymbols>
24+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
25+
<FileUpgradeFlags>
26+
</FileUpgradeFlags>
27+
<UpgradeBackupLocation>
28+
</UpgradeBackupLocation>
29+
<OldToolsVersion>2.0</OldToolsVersion>
30+
<TargetFrameworkProfile />
2931
</PropertyGroup>
3032
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
3133
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
3234
<DefineConstants>DEBUG</DefineConstants>
35+
<OutputPath>bin\UnitTests\</OutputPath>
3336
</PropertyGroup>
3437
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3538
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3639
</PropertyGroup>
37-
<ItemGroup>
38-
<Reference Include="nunit.framework">
39-
<HintPath>..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
40-
<SpecificVersion>False</SpecificVersion>
41-
</Reference>
42-
</ItemGroup>
4340
<ItemGroup>
4441
<Compile Include="AssemblyInfo.cs" />
4542
<Compile Include="DocumentTests.cs" />
@@ -50,9 +47,16 @@
5047
<ItemGroup>
5148
<ProjectReference Include="..\Project\ICSharpCode.TextEditor.csproj">
5249
<Project>{2d18be89-d210-49eb-a9dd-2246fbb3df6d}</Project>
53-
<Package>{00000000-0000-0000-0000-000000000000}</Package>
5450
<Name>ICSharpCode.TextEditor</Name>
5551
</ProjectReference>
5652
</ItemGroup>
53+
<ItemGroup>
54+
<Reference Include="nunit.framework">
55+
<HintPath>..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
56+
</Reference>
57+
</ItemGroup>
58+
<ItemGroup>
59+
<None Include="packages.config" />
60+
</ItemGroup>
5761
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
5862
</Project>

‎Test/bin/UnitTests/nunit.framework.xml

+10,892
Large diffs are not rendered by default.

‎Test/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="2.6.1" targetFramework="net20" />
4+
</packages>

‎packages/NUnit.2.6.1/NUnit.2.6.1.nupkg

92 KB
Binary file not shown.

‎packages/NUnit.2.6.1/lib/nunit.framework.dll

144 KB
Binary file not shown.

‎packages/NUnit.2.6.1/lib/nunit.framework.xml

+10,892
Large diffs are not rendered by default.

‎packages/NUnit.2.6.1/license.txt

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Copyright � 2002-2012 Charlie Poole
2+
Copyright � 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
3+
Copyright � 2000-2002 Philip A. Craig
4+
5+
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
6+
7+
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
8+
9+
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
10+
11+
Portions Copyright � 2002-2012 Charlie Poole or Copyright � 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright � 2000-2002 Philip A. Craig
12+
13+
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
14+
15+
3. This notice may not be removed or altered from any source distribution.

‎packages/repositories.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<repositories>
3+
<repository path="..\Test\packages.config" />
4+
</repositories>

0 commit comments

Comments
 (0)
Please sign in to comment.