diff --git a/Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj b/Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj
index 3f4d63c..95e3b04 100644
--- a/Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj
+++ b/Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj
@@ -2,7 +2,7 @@
{F25685EC-098A-4080-95A9-445268609806}
WinExe
- net6-windows
+ net7-windows
true
ScintillaNET.TestApp
@@ -20,17 +20,15 @@
full
- true
AnyCPU
full
- AnyCPU
+ x86
full
- false
- AnyCPU
+ x64
pdbonly
diff --git a/Scintilla.NET/Scintilla.NET.csproj b/Scintilla.NET/Scintilla.NET.csproj
index 6443245..b7cc912 100644
--- a/Scintilla.NET/Scintilla.NET.csproj
+++ b/Scintilla.NET/Scintilla.NET.csproj
@@ -1,14 +1,14 @@
{22AE2386-60F1-476E-9303-61CDB0AAC4CF}
- netcoreapp3.1;net5.0-windows;net45;net6-windows
+ netcoreapp3.1;net5.0-windows;net45;net6-windows;net7-windows
ScintillaNET
Jacob Slusser, VPKSoft, cyber960
Scintilla.NET
en-US
Source Editing Component based on Scintilla 5 series.
- Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2021.
- 5.3.1.3
+ Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2022.
+ 5.3.2.0
true
bin\$(Configuration)\ScintillaNET.xml
true
diff --git a/Shared/Scintilla.cs b/Shared/Scintilla.cs
index e87cbc4..de2ed6c 100644
--- a/Shared/Scintilla.cs
+++ b/Shared/Scintilla.cs
@@ -1043,11 +1043,16 @@ internal static string GetModulePath()
var name = string.Format(CultureInfo.InvariantCulture, "Global\\{{{0}}}", guid);
using (var mutex = new Mutex(false, name))
{
+// Blocked because the library version conflicted in the designer using .NET 7 and DevExpress WinForms,
+// See: https://github.com/VPKSoft/ScintillaNET/issues/28
+// See: https://supportcenter.devexpress.com/ticket/details/t1133409/scintilla-net-5-3-1-3-don-t-work-when-devexpress-libraries-added-to-project
+#if USE_MUTEX_ACCESS
var access = new MutexAccessRule(new SecurityIdentifier(WellKnownSidType.WorldSid, null),
MutexRights.FullControl, AccessControlType.Allow);
var security = new MutexSecurity();
security.AddAccessRule(access);
mutex.SetAccessControl(security);
+#endif
var ownsHandle = false;
try
diff --git a/Shared/x64/Scintilla.zip b/Shared/x64/Scintilla.zip
index 496e274..3a33e62 100644
Binary files a/Shared/x64/Scintilla.zip and b/Shared/x64/Scintilla.zip differ
diff --git a/Shared/x86/Scintilla.zip b/Shared/x86/Scintilla.zip
index 4a6f125..020422f 100644
Binary files a/Shared/x86/Scintilla.zip and b/Shared/x86/Scintilla.zip differ