Skip to content

Commit bb2fda5

Browse files
codingsebcodingseb
committed
OK
1 parent e67b053 commit bb2fda5

File tree

4 files changed

+28
-22
lines changed

4 files changed

+28
-22
lines changed

‎CSharpRegexTools4Npp/CSharpRegexTools4Npp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
44
<TargetFramework>net481</TargetFramework>

‎CSharpRegexTools4Npp/Main.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ public static void ShowTheDialog()
250250

251251
dialog.Show();
252252

253-
SetWindowLong(new WindowInteropHelper(dialog).Handle, (int)WindowLongFlags.GWLP_HWNDPARENT, PluginBase.nppData._nppHandle);
253+
Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.MODELESSDIALOGADD, (int)NppMsg.NPPM_MODELESSDIALOG, new WindowInteropHelper(dialog).Handle.ToInt32());
254+
//SetWindowLong(new WindowInteropHelper(dialog).Handle, (int)WindowLongFlags.GWLP_HWNDPARENT, PluginBase.nppData._nppHandle);
254255
SetLayeredWindowAttributes(new WindowInteropHelper(dialog).Handle, 0, 128, LWA_ALPHA);
255256
}
256257
}

‎RegexDialog/RegExToolDialog.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
MinHeight="300"
1212
MinWidth="600"
1313
Width="1427.97"
14-
WindowStyle="ToolWindow"
1514
Closing="Window_Closing"
1615
Loaded="Root_Loaded"
1716
SizeChanged="Root_SizeChanged"

‎RegexDialog/RegexDialog.csproj

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,34 +50,40 @@
5050
<Resource Include="Resources\VSSolution.sln" />
5151
<Resource Include="Resources\VSProject.csproj" />
5252
<Resource Include="Resources\page_white_csharp.png" />
53-
<Resource Include="FodyWeavers.xml"/>
53+
<Resource Include="FodyWeavers.xml" />
5454
</ItemGroup>
5555
<ItemGroup>
56-
<PackageReference Include="AvalonEdit" Version="6.0.1" />
56+
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
5757
<PackageReference Include="ClosedXML" Version="0.102.2" />
58-
<PackageReference Include="CodingSeb.Converters" Version="1.0.5" />
58+
<PackageReference Include="CodingSeb.Converters" Version="1.0.8" />
5959
<PackageReference Include="CodingSeb.ExpressionEvaluator" Version="1.4.40" />
6060
<PackageReference Include="CodingSeb.Layouts" Version="1.0.4" />
6161
<PackageReference Include="CodingSeb.Mvvm" Version="1.2.4" />
6262
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
6363
<PackageReference Include="CS-Script.bin" Version="3.30.5.1" />
6464
<PackageReference Include="CS-Script.lib" Version="3.30.5.1" />
6565
<PackageReference Include="CS-Script.RoslynProvider" Version="3.30.3" />
66-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.16.0" />
66+
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
6767
<PackageReference Include="ExcelNumberFormat" Version="1.1.0" />
68-
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
69-
<PackageReference Include="Irony.NetCore" Version="1.0.11" />
70-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
71-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" />
72-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
73-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.8.0" />
74-
<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="3.8.0" />
68+
<PackageReference Include="Fody" Version="6.8.1" PrivateAssets="all" />
69+
<PackageReference Include="Irony.NetCore" Version="1.1.11" />
70+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
71+
<PrivateAssets>all</PrivateAssets>
72+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
73+
</PackageReference>
74+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
75+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
76+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.10.0" />
77+
<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="4.10.0" />
7578
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
76-
<PackageReference Include="Microsoft.Net.Compilers" Version="3.8.0" />
77-
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
79+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.10.0">
80+
<PrivateAssets>all</PrivateAssets>
81+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
82+
</PackageReference>
83+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
7884
<PackageReference Include="Microsoft.SDK.Expression.Blend" Version="1.0.0" />
7985
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
80-
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
86+
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
8187
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
8288
<PackageReference Include="Ookii.Dialogs.WinForms" Version="4.0.0" />
8389
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
@@ -92,7 +98,7 @@
9298
<PackageReference Include="System.Console" Version="4.3.1" />
9399
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
94100
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
95-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.3.0" />
101+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
96102
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
97103
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
98104
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
@@ -105,19 +111,19 @@
105111
<PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
106112
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
107113
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
108-
<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
114+
<PackageReference Include="System.IO.Packaging" Version="8.0.0" />
109115
<PackageReference Include="System.Linq" Version="4.3.0" />
110116
<PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
111117
<PackageReference Include="System.Memory" Version="4.5.5" />
112-
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
118+
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
113119
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
114120
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
115121
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
116122
<PackageReference Include="System.Reflection" Version="4.3.0" />
117123
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
118124
<PackageReference Include="System.Reflection.Metadata" Version="8.0.0" />
119125
<PackageReference Include="System.Reflection.Primitives" Version="4.3.0" />
120-
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
126+
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
121127
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
122128
<PackageReference Include="System.Runtime" Version="4.3.1" />
123129
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
@@ -146,6 +152,6 @@
146152
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
147153
<PackageReference Include="System.Xml.XPath" Version="4.3.0" />
148154
<PackageReference Include="System.Xml.XPath.XDocument" Version="4.3.0" />
149-
<PackageReference Include="XLParser" Version="1.5.2" />
155+
<PackageReference Include="XLParser" Version="1.7.2" />
150156
</ItemGroup>
151157
</Project>

0 commit comments

Comments
 (0)