From 00dd8040ac70def2902d770f778fe84b59af1ebe Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 00:51:36 +0200 Subject: [PATCH 1/7] migrated to sdk-style project --- FastColoredTextBox/FastColoredTextBox.csproj | 146 ++---------------- FastColoredTextBox/Properties/AssemblyInfo.cs | 21 --- 2 files changed, 11 insertions(+), 156 deletions(-) diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj index 0707e4e2..1f99f751 100644 --- a/FastColoredTextBox/FastColoredTextBox.csproj +++ b/FastColoredTextBox/FastColoredTextBox.csproj @@ -1,148 +1,24 @@  - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {6DD14A85-CCFC-4774-BD26-0F5772512319} - Library - Properties + net20 FastColoredTextBoxNS - FastColoredTextBox - v2.0 - 512 - - - - true - full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - bin\Debug\FastColoredTextBox.XML - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + Fast сolored textbox control + Pavel Torgashov + © Pavel Torgashov, 2011-2016, pavel_torgashov@ukr.net. + + 2.16.26.0 true - - FCTB_key.snk + - - - - - - - - - Component - - - - - Component - - - - - - Form - - - GoToForm.cs - - - - Form - - - HotkeysEditorForm.cs - - - - - - - - UserControl - - - Ruler.cs - - - - - Form - - - ReplaceForm.cs - - - UserControl - - - - - Form - - - FindForm.cs - - - - - - - - - - - - UserControl - - - - - - FastColoredTextBox.cs - - - FindForm.cs - - - GoToForm.cs - - - HotkeysEditorForm.cs - - - ReplaceForm.cs - Designer - - - - - - + \ No newline at end of file diff --git a/FastColoredTextBox/Properties/AssemblyInfo.cs b/FastColoredTextBox/Properties/AssemblyInfo.cs index 1bc524e0..6dcb3510 100644 --- a/FastColoredTextBox/Properties/AssemblyInfo.cs +++ b/FastColoredTextBox/Properties/AssemblyInfo.cs @@ -1,16 +1,9 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("FastColoredTextBox")] -[assembly: AssemblyDescription("Fast сolored textbox control")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Pavel Torgashov")] -[assembly: AssemblyProduct("FastColoredTextBox")] -[assembly: AssemblyCopyright("© Pavel Torgashov, 2011-2016, pavel_torgashov@ukr.net.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -21,17 +14,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("95be11b3-45bc-4512-be26-a860a78bd1f1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.16.26.0")] -[assembly: AssemblyFileVersion("2.16.26.0")] - \ No newline at end of file From 61bc7553f249c645b405c832a789940b61bf8241 Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 00:54:16 +0200 Subject: [PATCH 2/7] added net5 target framework --- FastColoredTextBox/FastColoredTextBox.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj index 1f99f751..410e1560 100644 --- a/FastColoredTextBox/FastColoredTextBox.csproj +++ b/FastColoredTextBox/FastColoredTextBox.csproj @@ -2,7 +2,8 @@ - net20 + net20;net5.0-windows + true FastColoredTextBoxNS @@ -16,7 +17,7 @@ FCTB_key.snk - + From 1a5d5431979c3aefcff8c94885c156d8c0a1b243 Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 00:58:20 +0200 Subject: [PATCH 3/7] resolved compiler warning --- FastColoredTextBox/DocumentMap.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FastColoredTextBox/DocumentMap.cs b/FastColoredTextBox/DocumentMap.cs index f3eb38a7..ae519c6f 100644 --- a/FastColoredTextBox/DocumentMap.cs +++ b/FastColoredTextBox/DocumentMap.cs @@ -45,7 +45,7 @@ public FastColoredTextBox Target /// [Description("Scale")] [DefaultValue(0.3f)] - public float Scale + public new float Scale { get { return scale; } set From 07afa151fee9cf984c1cec9b6a3298da0b348aa7 Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 01:30:02 +0200 Subject: [PATCH 4/7] generate documentation file on build --- FastColoredTextBox/FastColoredTextBox.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj index 410e1560..d8b70c08 100644 --- a/FastColoredTextBox/FastColoredTextBox.csproj +++ b/FastColoredTextBox/FastColoredTextBox.csproj @@ -15,6 +15,7 @@ 2.16.26.0 true FCTB_key.snk + true From 092bd1997ab1052c0d60a95a97af8731575f4d51 Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 01:31:38 +0200 Subject: [PATCH 5/7] generate package on release build --- FastColoredTextBox/FastColoredTextBox.csproj | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj index d8b70c08..2babcfdc 100644 --- a/FastColoredTextBox/FastColoredTextBox.csproj +++ b/FastColoredTextBox/FastColoredTextBox.csproj @@ -18,6 +18,17 @@ true + + FCTB + Fast Colored TextBox + $(Company) + $(Company) + Fast Colored TextBox for Syntax Highlighting. The text editor component for .NET. + http://www.codeproject.com/Articles/161871/Fast-Colored-TextBox-for-syntax-highlighting + $(MSBuildThisFileDirectory)..\Binary + true + + From ab0dd3087dce85a87192c7338783a8a2283ad7a8 Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 01:41:25 +0200 Subject: [PATCH 6/7] pre-release version 2.16.27-beta-001 --- FastColoredTextBox/FastColoredTextBox.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FastColoredTextBox/FastColoredTextBox.csproj b/FastColoredTextBox/FastColoredTextBox.csproj index 2babcfdc..400e00de 100644 --- a/FastColoredTextBox/FastColoredTextBox.csproj +++ b/FastColoredTextBox/FastColoredTextBox.csproj @@ -12,7 +12,8 @@ Pavel Torgashov © Pavel Torgashov, 2011-2016, pavel_torgashov@ukr.net. - 2.16.26.0 + 2.16.27 + beta-001 true FCTB_key.snk true From 807a046ff3ab7b3a3e9a4c186240108637af95d8 Mon Sep 17 00:00:00 2001 From: Christof Senn Date: Fri, 6 Aug 2021 01:43:32 +0200 Subject: [PATCH 7/7] ignoring '.vs' and 'Binary' folders --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index bdc3535f..61df5eca 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ TestResults ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +.vs # User-specific files *.suo @@ -14,6 +15,7 @@ TestResults *.sln.docstates # Build results +Binary [Dd]ebug/ [Rr]elease/ x64/