Merge pull request #24 from gitextensions/Convert_to_.NET_5.0

Convert to .NET 5.0

Directory.Build.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <PropertyGroup>
+    <Copyright>Copyright &#xA9; 2000-2010 AlphaSierraPapa // Copyright &#xA9; 2019 Git Extensions</Copyright>
+    <Description>This is a GitExtensions fork of SharpDevelop .NET text editor control</Description>
+    <Version>4.0.2.6466</Version>
+    <Product>Git Extensions</Product>
+    <Company>Git Extensions</Company>
+    <Authors>ic#code // Git Extensions</Authors>
+  </PropertyGroup>
+
+
+</Project>

Project/ICSharpCode.TextEditor.csproj

@@ -1,26 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
-    <NoWarn>$(NoWarn),1573,1591,1696,1712</NoWarn>
-    <LangVersion>latest</LangVersion>
-
-    <!-- TODO once all project migrated to SDK-style, remove this and move properties to Directory.Build.props -->
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\*.*" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\*.xshd" />
+    <None Remove="Resources\Mode.xsd" />
+    <None Remove="Resources\RightArrow.cur" />
+    <None Remove="Resources\SyntaxModes.xml" />
+    <None Remove="Resources\TextEditorControl.bmp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\*.xshd" />
+    <EmbeddedResource Include="Resources\Mode.xsd" />
+    <EmbeddedResource Include="Resources\RightArrow.cur" />
+    <EmbeddedResource Include="Resources\SyntaxModes.xml" />
+    <EmbeddedResource Include="Resources\TextEditorControl.bmp" />
+  </ItemGroup>
+
+</Project>

Project/Properties/AssemblyInfo.cs

@@ -1,45 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyCompany("ic#code")]
-[assembly: AssemblyCopyright("2000-2010 AlphaSierraPapa")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-[assembly: StringFreezing]
-
-[assembly: AssemblyTitle("ICSharpCode.TextEditor v4.0.2.6466")]
-[assembly: AssemblyDescription("This is a GitExtensions fork of SharpDevelop .NET text editor control")]
-[assembly: AssemblyConfiguration("")]
-
-[assembly: AssemblyProduct("GitExtensions")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("3.1.0")]
-[assembly: AssemblyFileVersion("3.1.0")]
-[assembly: AssemblyInformationalVersion("3.1.0")]
-
-// Disable CLS compliance. See https://github.com/gitextensions/gitextensions/issues/4710
-[assembly: CLSCompliant(isCompliant: false)]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]

Project/Src/Document/AbstractSegment.cs

@@ -14,9 +14,9 @@ namespace ICSharpCode.TextEditor.Document
     /// </summary>
     public class AbstractSegment : ISegment
     {
-        [CLSCompliant(isCompliant: false)] protected int length = -1;
+        protected int length = -1;
 
-        [CLSCompliant(isCompliant: false)] protected int offset = -1;
+        protected int offset = -1;
 
         public override string ToString()
         {

Project/Src/Document/FoldingStrategy/FoldMarker.cs

@@ -21,9 +21,9 @@ namespace ICSharpCode.TextEditor.Document
     {
         private readonly IDocument document;
 
-        [CLSCompliant(isCompliant: false)] protected int length = -1;
+        protected int length = -1;
 
-        [CLSCompliant(isCompliant: false)] protected int offset = -1;
+        protected int offset = -1;
 
         private int startLine = -1, startColumn, endLine = -1, endColumn;
 

Project/Src/Document/MarkerStrategy/TextMarker.cs

@@ -22,9 +22,9 @@ namespace ICSharpCode.TextEditor.Document
     /// </summary>
     public class TextMarker : ISegment
     {
-        [CLSCompliant(isCompliant: false)] protected int length = -1;
+        protected int length = -1;
 
-        [CLSCompliant(isCompliant: false)] protected int offset = -1;
+        protected int offset = -1;
 
         public TextMarker(int offset, int length, TextMarkerType textMarkerType) : this(offset, length, textMarkerType, Color.Red)
         {

Project/Src/Gui/AbstractMargin.cs

@@ -21,9 +21,9 @@ namespace ICSharpCode.TextEditor
     /// </summary>
     public abstract class AbstractMargin
     {
-        [CLSCompliant(isCompliant: false)] protected Rectangle drawingPosition = new Rectangle(x: 0, y: 0, width: 0, height: 0);
+        protected Rectangle drawingPosition = new Rectangle(x: 0, y: 0, width: 0, height: 0);
 
-        [CLSCompliant(isCompliant: false)] protected TextArea textArea;
+        protected TextArea textArea;
 
         protected AbstractMargin(TextArea textArea)
         {