diff --git a/Demo/Demo.csproj b/Demo/Demo.csproj
index 1085cad..da10dbc 100644
--- a/Demo/Demo.csproj
+++ b/Demo/Demo.csproj
@@ -1,100 +1,16 @@
-
-
-
+
- Debug
- AnyCPU
- {CFD9151B-59C7-44A7-A93A-22EC9385738D}
+ netcoreapp3.1
+ 9
+ true
+ true
+ Demo.Program
WinExe
- Properties
- Demo
- Demo
- v4.5.2
- 512
- true
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
- ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- Form1.cs
-
-
-
-
- Form1.cs
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
- Designer
-
-
- True
- Resources.resx
-
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
- True
- Settings.settings
- True
-
-
-
+
-
- {548fd833-9a3b-41bb-9850-570afe9a91b7}
- ScintillaNET FindReplaceDialog
-
+
-
-
-
\ No newline at end of file
+
diff --git a/Demo/Form1.Designer.cs b/Demo/Form1.Designer.cs
index 705dc46..a276ef9 100644
--- a/Demo/Form1.Designer.cs
+++ b/Demo/Form1.Designer.cs
@@ -1,4 +1,6 @@
-namespace Demo
+using ScintillaNET;
+
+namespace Demo
{
partial class Form1
{
@@ -184,7 +186,7 @@ private void InitializeComponent()
#endregion
- private ScintillaNET.Scintilla scintilla1;
+ private Scintilla scintilla1;
private ScintillaNET_FindReplaceDialog.IncrementalSearcher incrementalSearcher1;
private System.Windows.Forms.Button GotoButton;
private ScintillaNET_FindReplaceDialog.FindAllResults.FindAllResultsPanel findAllResultsPanel1;
diff --git a/Demo/Program.cs b/Demo/Program.cs
index 205bc6f..d007755 100644
--- a/Demo/Program.cs
+++ b/Demo/Program.cs
@@ -6,13 +6,13 @@
namespace Demo
{
- static class Program
+ public static class Program
{
///
/// The main entry point for the application.
///
[STAThread]
- static void Main()
+ public static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
diff --git a/Demo/Properties/AssemblyInfo.cs b/Demo/Properties/AssemblyInfo.cs
deleted file mode 100644
index 956c63b..0000000
--- a/Demo/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-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("Demo")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Demo")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 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)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("cfd9151b-59c7-44a7-a93a-22ec9385738d")]
-
-// 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ScintillaNet FindReplaceDialog/FindReplace/FindReplace.cs b/ScintillaNet FindReplaceDialog/FindReplace/FindReplace.cs
index 585c5e0..5ad4147 100644
--- a/ScintillaNet FindReplaceDialog/FindReplace/FindReplace.cs
+++ b/ScintillaNet FindReplaceDialog/FindReplace/FindReplace.cs
@@ -232,7 +232,7 @@ public CharacterRange Find(int startPos, int endPos, Regex findExpression, bool
return Find(new CharacterRange(startPos, endPos), findExpression, searchUp);
}
- public unsafe CharacterRange Find(int startPos, int endPos, string searchString, SearchFlags flags)
+ public CharacterRange Find(int startPos, int endPos, string searchString, SearchFlags flags)
{
if (string.IsNullOrEmpty(searchString))
return new CharacterRange();
diff --git a/ScintillaNet FindReplaceDialog/Properties/AssemblyInfo.cs b/ScintillaNet FindReplaceDialog/Properties/AssemblyInfo.cs
deleted file mode 100644
index f99662f..0000000
--- a/ScintillaNet FindReplaceDialog/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-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("ScintillaNet FindReplaceDialog")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ScintillaNet FindReplaceDialog")]
-[assembly: AssemblyCopyright("Copyright © 2016-2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 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)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("548fd833-9a3b-41bb-9850-570afe9a91b7")]
-
-// 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("1.4.0.*")]
-[assembly: AssemblyFileVersion("1.4.0")]
diff --git a/ScintillaNet FindReplaceDialog/ScintillaNET FindReplaceDialog.csproj b/ScintillaNet FindReplaceDialog/ScintillaNET FindReplaceDialog.csproj
index 57e092a..30d3d32 100644
--- a/ScintillaNet FindReplaceDialog/ScintillaNET FindReplaceDialog.csproj
+++ b/ScintillaNet FindReplaceDialog/ScintillaNET FindReplaceDialog.csproj
@@ -1,129 +1,10 @@
-
-
-
-
- Debug
- AnyCPU
- {548FD833-9A3B-41BB-9850-570AFE9A91B7}
- Library
- Properties
- ScintillaNET_FindReplaceDialog
- ScintillaNET FindReplaceDialog
- v4.0
- 512
- Client
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- true
- bin\Debug\ScintillaNET FindReplaceDialog.XML
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
- true
- bin\Release\ScintillaNET FindReplaceDialog.XML
-
-
-
- ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- UserControl
-
-
- FindAllResultsPanel.cs
-
-
-
- Component
-
-
- Form
-
-
- FindReplaceDialog.cs
-
-
- UserControl
-
-
- IncrementalSearcher.cs
-
-
- Component
-
-
-
- Form
-
-
- GoToDialog.cs
-
-
-
- True
- True
- Resources.resx
-
-
-
-
- FindAllResultsPanel.cs
-
-
- FindReplaceDialog.cs
-
-
- IncrementalSearcher.cs
-
-
- GoToDialog.cs
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+ netcoreapp3.1
+ 9
+ true
+
+
+
+
+
diff --git a/ScintillaNet FindReplaceDialog/packages.config b/ScintillaNet FindReplaceDialog/packages.config
deleted file mode 100644
index 40f9274..0000000
--- a/ScintillaNet FindReplaceDialog/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file