Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Scintilla native from 5.3.1 --> 5.3.2. #29

Merged
merged 4 commits into from
Dec 18, 2022
Merged

Update Scintilla native from 5.3.1 --> 5.3.2. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d8786e
Update Scintilla native from 5.3.1 --> 5.3.2.
Dec 18, 2022
0b3c2de
Update copyright year.
Dec 18, 2022
f15a735
Update build pipeline NET version.
Dec 18, 2022
6bc3f5f
Revert pipeline update.
Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{F25685EC-098A-4080-95A9-445268609806}</ProjectGuid>
<OutputType>WinExe</OutputType>
<TargetFramework>net6-windows</TargetFramework>
<TargetFramework>net7-windows</TargetFramework>
<!-- <TargetFramework>net47</TargetFramework> -->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>ScintillaNET.TestApp</AssemblyTitle>
Expand All @@ -20,17 +20,15 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
<Prefer32Bit>true</Prefer32Bit>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugType>full</DebugType>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand Down
6 changes: 3 additions & 3 deletions Scintilla.NET/Scintilla.NET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{22AE2386-60F1-476E-9303-61CDB0AAC4CF}</ProjectGuid>
<TargetFrameworks>netcoreapp3.1;net5.0-windows;net45;net6-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0-windows;net45;net6-windows;net7-windows</TargetFrameworks>
<AssemblyTitle>ScintillaNET</AssemblyTitle>
<Company>Jacob Slusser, VPKSoft, cyber960</Company>
<Product>Scintilla.NET</Product>
<NeutralLanguage>en-US</NeutralLanguage>
<Description>Source Editing Component based on Scintilla 5 series.</Description>
<Copyright>Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2021.</Copyright>
<Version>5.3.1.3</Version>
<Copyright>Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2022.</Copyright>
<Version>5.3.2.0</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DocumentationFile>bin\$(Configuration)\ScintillaNET.xml</DocumentationFile>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
5 changes: 5 additions & 0 deletions Shared/Scintilla.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified Shared/x64/Scintilla.zip
View file
Open in desktop
Binary file not shown.
Binary file modified Shared/x86/Scintilla.zip
View file
Open in desktop
Binary file not shown.