From 94b943d4185cb3c70f8eed459570a63c0863b84f Mon Sep 17 00:00:00 2001 From: RussKie Date: Wed, 5 May 2021 21:09:11 +1000 Subject: [PATCH] Convert to .NET 5.0 --- Directory.Build.props | 14 +++++ Project/ICSharpCode.TextEditor.csproj | 52 +++++++++---------- Project/Properties/AssemblyInfo.cs | 45 ---------------- Project/Src/Document/AbstractSegment.cs | 4 +- .../Document/FoldingStrategy/FoldMarker.cs | 4 +- .../Src/Document/MarkerStrategy/TextMarker.cs | 4 +- Project/Src/Gui/AbstractMargin.cs | 4 +- 7 files changed, 48 insertions(+), 79 deletions(-) create mode 100644 Directory.Build.props delete mode 100644 Project/Properties/AssemblyInfo.cs diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..8d3b6e3 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,14 @@ + + + + + Copyright © 2000-2010 AlphaSierraPapa // Copyright © 2019 Git Extensions + This is a GitExtensions fork of SharpDevelop .NET text editor control + 4.0.2.6466 + Git Extensions + Git Extensions + ic#code // Git Extensions + + + + diff --git a/Project/ICSharpCode.TextEditor.csproj b/Project/ICSharpCode.TextEditor.csproj index ec2f0dd..5ca8ffb 100644 --- a/Project/ICSharpCode.TextEditor.csproj +++ b/Project/ICSharpCode.TextEditor.csproj @@ -1,26 +1,26 @@ - - - net461 - $(NoWarn),1573,1591,1696,1712 - latest - - - false - - - - - - - - - - - - - - - - - - + + + + Library + net5.0-windows + true + false + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs deleted file mode 100644 index 30cb722..0000000 --- a/Project/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -// -// -// -// $Revision$ -// - -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)] diff --git a/Project/Src/Document/AbstractSegment.cs b/Project/Src/Document/AbstractSegment.cs index ec8a047..45d2491 100644 --- a/Project/Src/Document/AbstractSegment.cs +++ b/Project/Src/Document/AbstractSegment.cs @@ -14,9 +14,9 @@ namespace ICSharpCode.TextEditor.Document /// 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() { diff --git a/Project/Src/Document/FoldingStrategy/FoldMarker.cs b/Project/Src/Document/FoldingStrategy/FoldMarker.cs index d92b96b..fcbbab7 100644 --- a/Project/Src/Document/FoldingStrategy/FoldMarker.cs +++ b/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; diff --git a/Project/Src/Document/MarkerStrategy/TextMarker.cs b/Project/Src/Document/MarkerStrategy/TextMarker.cs index 7e2e153..182c0be 100644 --- a/Project/Src/Document/MarkerStrategy/TextMarker.cs +++ b/Project/Src/Document/MarkerStrategy/TextMarker.cs @@ -22,9 +22,9 @@ namespace ICSharpCode.TextEditor.Document /// 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) { diff --git a/Project/Src/Gui/AbstractMargin.cs b/Project/Src/Gui/AbstractMargin.cs index eb6ff96..f6a3e2d 100644 --- a/Project/Src/Gui/AbstractMargin.cs +++ b/Project/Src/Gui/AbstractMargin.cs @@ -21,9 +21,9 @@ namespace ICSharpCode.TextEditor /// 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) {