Skip to content

Commit febe6e3

Browse files
author
Sébastien Geiser
committed
Merge branch 'retry_to_net8'
2 parents 3020365 + b969bfa commit febe6e3

18 files changed

+253
-1111
lines changed

‎CSharpRegexTools4Npp.sln

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.9.34714.143
4+
VisualStudioVersion = 17.9.34728.123
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpRegexTools4Npp", "CSharpRegexTools4Npp\CSharpRegexTools4Npp.csproj", "{DF71B291-10BE-4C52-973E-C7E209497329}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpRegexTools4Npp", "CSharpRegexTools4Npp\CSharpRegexTools4Npp.csproj", "{A15139CC-6B92-4881-9F2F-7C5554A6F158}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegexDialog", "RegexDialog\RegexDialog.csproj", "{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RegexDialog", "RegexDialog\RegexDialog.csproj", "{A4587B92-5236-401D-BFEB-D7D46BC09A0F}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,27 +15,27 @@ Global
1515
Release|x86 = Release|x86
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18-
{DF71B291-10BE-4C52-973E-C7E209497329}.Debug|x64.ActiveCfg = Debug|x64
19-
{DF71B291-10BE-4C52-973E-C7E209497329}.Debug|x64.Build.0 = Debug|x64
20-
{DF71B291-10BE-4C52-973E-C7E209497329}.Debug|x86.ActiveCfg = Debug|x86
21-
{DF71B291-10BE-4C52-973E-C7E209497329}.Debug|x86.Build.0 = Debug|x86
22-
{DF71B291-10BE-4C52-973E-C7E209497329}.Release|x64.ActiveCfg = Release|x64
23-
{DF71B291-10BE-4C52-973E-C7E209497329}.Release|x64.Build.0 = Release|x64
24-
{DF71B291-10BE-4C52-973E-C7E209497329}.Release|x86.ActiveCfg = Release|x86
25-
{DF71B291-10BE-4C52-973E-C7E209497329}.Release|x86.Build.0 = Release|x86
26-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Debug|x64.ActiveCfg = Debug|Any CPU
27-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Debug|x64.Build.0 = Debug|Any CPU
28-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Debug|x86.ActiveCfg = Debug|Any CPU
29-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Debug|x86.Build.0 = Debug|Any CPU
30-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Release|x64.ActiveCfg = Release|Any CPU
31-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Release|x64.Build.0 = Release|Any CPU
32-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Release|x86.ActiveCfg = Release|Any CPU
33-
{E9AB46E2-6CCF-4998-9EF4-28F7E8961C31}.Release|x86.Build.0 = Release|Any CPU
18+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Debug|x64.ActiveCfg = Debug|x64
19+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Debug|x64.Build.0 = Debug|x64
20+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Debug|x86.ActiveCfg = Debug|x86
21+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Debug|x86.Build.0 = Debug|x86
22+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Release|x64.ActiveCfg = Release|x64
23+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Release|x64.Build.0 = Release|x64
24+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Release|x86.ActiveCfg = Release|x86
25+
{A15139CC-6B92-4881-9F2F-7C5554A6F158}.Release|x86.Build.0 = Release|x86
26+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Debug|x64.ActiveCfg = Debug|x64
27+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Debug|x64.Build.0 = Debug|x64
28+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Debug|x86.ActiveCfg = Debug|x86
29+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Debug|x86.Build.0 = Debug|x86
30+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Release|x64.ActiveCfg = Release|x64
31+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Release|x64.Build.0 = Release|x64
32+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Release|x86.ActiveCfg = Release|x86
33+
{A4587B92-5236-401D-BFEB-D7D46BC09A0F}.Release|x86.Build.0 = Release|x86
3434
EndGlobalSection
3535
GlobalSection(SolutionProperties) = preSolution
3636
HideSolutionNode = FALSE
3737
EndGlobalSection
3838
GlobalSection(ExtensibilityGlobals) = postSolution
39-
SolutionGuid = {5FD18A7C-CF42-415A-92F5-7B9AD4B6BCD8}
39+
SolutionGuid = {B1720AB5-5228-4E68-ACD9-5B458A21407C}
4040
EndGlobalSection
4141
EndGlobal

‎CSharpRegexTools4Npp/CSharpRegexTools4Npp.csproj

Lines changed: 80 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,84 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<!--<Import Project="PluginInfrastructure\DllExport\NppPlugin.DllExport.targets" />-->
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7-
<ProjectGuid>{DF71B291-10BE-4C52-973E-C7E209497329}</ProjectGuid>
4+
<TargetFramework>net481</TargetFramework>
85
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CSharpRegexTools4Npp</RootNamespace>
11-
<AssemblyName>CSharpRegexTools4Npp</AssemblyName>
12-
<OutputPath>bin\Debug\</OutputPath>
13-
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
14-
<LangVersion>9.0</LangVersion>
15-
<TargetFrameworkProfile />
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<DebugType>full</DebugType>
23-
<ErrorReport>prompt</ErrorReport>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug</OutputPath>
26-
<PlatformTarget>x86</PlatformTarget>
27-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
28-
<Prefer32Bit>false</Prefer32Bit>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
31-
<DefineConstants>TRACE</DefineConstants>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release</OutputPath>
34-
<DebugType>pdbonly</DebugType>
35-
<ErrorReport>prompt</ErrorReport>
36-
<PlatformTarget>x86</PlatformTarget>
37-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
38-
<Prefer32Bit>false</Prefer32Bit>
39-
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
41-
<DebugSymbols>true</DebugSymbols>
42-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
43-
<DebugType>full</DebugType>
44-
<ErrorReport>prompt</ErrorReport>
45-
<Optimize>false</Optimize>
46-
<OutputPath>bin\Debug-x64</OutputPath>
47-
<PlatformTarget>x64</PlatformTarget>
48-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
49-
<Prefer32Bit>false</Prefer32Bit>
50-
</PropertyGroup>
51-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
52-
<DefineConstants>TRACE;X64</DefineConstants>
53-
<Optimize>true</Optimize>
54-
<OutputPath>bin\Release-x64</OutputPath>
55-
<DebugType>pdbonly</DebugType>
56-
<ErrorReport>prompt</ErrorReport>
57-
<PlatformTarget>x64</PlatformTarget>
58-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
59-
<Prefer32Bit>false</Prefer32Bit>
60-
</PropertyGroup>
61-
<PropertyGroup>
62-
<!-- Default values for debugging sso it start correct version of Notepad++
63-
$(ProgramW6432) and $(MSBuildProgramFiles32) points to the 64 and 32 bit "Program Files" directories -->
64-
<StartAction>Program</StartAction>
65-
<StartProgram Condition="'$(Platform)'=='x64'">$(ProgramW6432)\Notepad++\notepad++.exe</StartProgram>
66-
<StartProgram Condition="'$(Platform)'=='x86'">$(MSBuildProgramFiles32)\Notepad++\notepad++.exe</StartProgram>
6+
<LangVersion>9.0</LangVersion>
7+
<AssemblyTitle>C# Regex Tools 4 Npp</AssemblyTitle>
8+
<Product>C# Regex Tools 4 Npp</Product>
9+
<Copyright>Copyright © CodingSeb 2024</Copyright>
10+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11+
<UseWindowsForms>true</UseWindowsForms>
12+
<UseWPF>true</UseWPF>
13+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
14+
<StartAction>Program</StartAction>
15+
<StartProgram Condition="'$(Platform)'=='x64'">$(ProgramW6432)\Notepad++\notepad++.exe</StartProgram>
16+
<StartProgram Condition="'$(Platform)'=='x86'">$(MSBuildProgramFiles32)\Notepad++\notepad++.exe</StartProgram>
17+
<OutputPath>bin\$(Configuration)\$(Platform)</OutputPath>
18+
<Nullable>disable</Nullable>
19+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
20+
<Platforms>x64;x86</Platforms>
21+
<Version>1.1.11.0</Version>
22+
<AssemblyVersion>1.1.11.0</AssemblyVersion>
23+
<FileVersion>1.1.11.0</FileVersion>
6724
</PropertyGroup>
25+
<UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask"
26+
AssemblyFile="PluginInfrastructure\DllExport\NppPlugin.DllExport.MSBuild.dll"/>
27+
<Target Name="NppTasksPlugin" DependsOnTargets="GetFrameworkPaths" AfterTargets="PostBuildEvent">
28+
<Message Text="NppTasksPlugin" />
29+
<PropertyGroup>
30+
<!-- LibToolPath is optional - it's needed to debug C++, but you can still debug the C# code without it
31+
If you don't have the C++ toolchain installed this is missing, but then you can't' debug C++ anyway -->
32+
<LibToolPath Condition="Exists('$(DevEnvDir)\..\..\VC\bin')">$(DevEnvDir)\..\..\VC\bin</LibToolPath>
33+
</PropertyGroup>
34+
<DllExportTask Platform="$(Platform)"
35+
PlatformTarget="$(PlatformTarget)"
36+
CpuType="$(CpuType)"
37+
EmitDebugSymbols="$(DebugSymbols)"
38+
DllExportAttributeAssemblyName="$(DllExportAttributeAssemblyName)"
39+
DllExportAttributeFullName="$(DllExportAttributeFullName)"
40+
Timeout="$(DllExportTimeout)"
41+
KeyContainer="$(KeyContainerName)$(AssemblyKeyContainerName)"
42+
KeyFile="$(KeyOriginatorFile)"
43+
ProjectDirectory="$(MSBuildProjectDirectory)"
44+
InputFileName="$(TargetPath)"
45+
FrameworkPath="$(TargetedFrameworkDir);$(TargetFrameworkDirectory)"
46+
LibToolPath="$(LibToolPath)"
47+
LibToolDllPath="$(DevEnvDir)"
48+
SdkPath="$(SDK40ToolsPath)"/>
49+
50+
<ItemGroup>
51+
<ReleaseFiles Include="$(TargetDir)*.dll"/>
52+
<ReleaseFiles Include="$(TargetDir)*.pdb"/>
53+
</ItemGroup>
54+
<!-- $(MSBuildProgramFiles32) points to the 32 bit program files dir.
55+
On 32 bit windows usually C:\Program Files\
56+
On 64 bit windows usually C:\Program Files (x86)\
57+
$(ProgramW6432) points to the 64bit Program Files (on 32 bit windows it is blank) -->
58+
<MakeDir Directories="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\') AND !Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" />
59+
<Copy
60+
SourceFiles="@(ReleaseFiles)"
61+
DestinationFolder="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\"
62+
Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'"
63+
ContinueOnError="false" />
64+
<MakeDir Directories="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(ProgramW6432)\Notepad++\plugins\') AND !Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'" />
65+
<Copy
66+
SourceFiles="@(ReleaseFiles)"
67+
DestinationFolder="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\"
68+
Condition="Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'"
69+
ContinueOnError="false" />
70+
</Target>
71+
<ItemGroup>
72+
<None Remove="NppPlugin.DllExport.targets" />
73+
</ItemGroup>
6874
<ItemGroup>
69-
<Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
71-
</Reference>
72-
<Reference Include="Microsoft.CSharp" />
73-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
74-
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
75-
</Reference>
76-
<Reference Include="PresentationCore" />
77-
<Reference Include="PresentationFramework" />
78-
<Reference Include="System" />
7975
<Reference Include="System.Configuration" />
80-
<Reference Include="System.Data" />
81-
<Reference Include="System.Drawing" />
8276
<Reference Include="System.IO.Compression" />
83-
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84-
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll</HintPath>
86-
</Reference>
87-
<Reference Include="System.Runtime.Serialization" />
8877
<Reference Include="System.ServiceModel" />
8978
<Reference Include="System.Transactions" />
90-
<Reference Include="System.Windows.Forms" />
91-
<Reference Include="System.Xaml" />
92-
<Reference Include="System.Xml" />
93-
<Reference Include="WindowsBase" />
94-
</ItemGroup>
95-
<ItemGroup>
96-
<Compile Include="Npp.cs" />
97-
<Compile Include="GlobalSuppressions.cs" />
98-
<Compile Include="PluginInfrastructure\ClikeStringArray.cs" />
99-
<Compile Include="PluginInfrastructure\DllExport\DllExportAttribute.cs" />
100-
<Compile Include="PluginInfrastructure\Win32.cs" />
101-
<Compile Include="Main.cs" />
102-
<Compile Include="PluginInfrastructure\GatewayDomain.cs" />
103-
<Compile Include="PluginInfrastructure\NotepadPPGateway.cs" />
104-
<Compile Include="PluginInfrastructure\ScintillaGateway.cs" />
105-
<Compile Include="PluginInfrastructure\IScintillaGateway.cs" />
106-
<Compile Include="PluginInfrastructure\NppPluginNETBase.cs" />
107-
<Compile Include="PluginInfrastructure\NppPluginNETHelper.cs" />
108-
<Compile Include="PluginInfrastructure\Docking_h.cs" />
109-
<Compile Include="PluginInfrastructure\MenuCmdID_h.cs" />
110-
<Compile Include="PluginInfrastructure\Scintilla_iface.cs" />
111-
<Compile Include="PluginInfrastructure\Msgs_h.cs" />
112-
<Compile Include="PluginInfrastructure\Preference_h.cs" />
113-
<Compile Include="PluginInfrastructure\Resource_h.cs" />
114-
<Compile Include="Properties\AssemblyInfo.cs" />
115-
<Compile Include="PluginInfrastructure\UnmanagedExports.cs" />
116-
<Compile Include="Resources.Designer.cs">
117-
<AutoGen>True</AutoGen>
118-
<DesignTime>True</DesignTime>
119-
<DependentUpon>Resources.resx</DependentUpon>
120-
</Compile>
121-
</ItemGroup>
122-
<ItemGroup>
123-
<EmbeddedResource Include="Resources.resx">
124-
<Generator>ResXFileCodeGenerator</Generator>
125-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
126-
</EmbeddedResource>
12779
</ItemGroup>
12880
<ItemGroup>
129-
<None Include="app.config" />
130-
<None Include="FodyWeavers.xsd">
131-
<SubType>Designer</SubType>
132-
</None>
133-
<None Include="packages.config" />
134-
<None Include="PluginInfrastructure\DllExport\NppPlugin.DllExport.targets">
81+
<None Update="FodyWeavers.xsd">
13582
<SubType>Designer</SubType>
13683
</None>
13784
</ItemGroup>
@@ -145,27 +92,14 @@
14592
<Content Include="img\icon.png" />
14693
</ItemGroup>
14794
<ItemGroup>
148-
<ProjectReference Include="..\RegexDialog\RegexDialog.csproj">
149-
<Project>{e9ab46e2-6ccf-4998-9ef4-28f7e8961c31}</Project>
150-
<Name>RegexDialog</Name>
151-
</ProjectReference>
95+
<None Include="FodyWeavers.xsd" />
96+
</ItemGroup>
97+
<ItemGroup>
98+
<ProjectReference Include="..\RegexDialog\RegexDialog.csproj" />
99+
</ItemGroup>
100+
<ItemGroup>
101+
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
102+
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
103+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
152104
</ItemGroup>
153-
<ItemGroup />
154-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
155-
<Import Project="$(MSBuildProjectDirectory)\PluginInfrastructure\DllExport\NppPlugin.DllExport.targets" />
156-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
157-
<PropertyGroup>
158-
<ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
159-
</PropertyGroup>
160-
<Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
161-
<Error Condition="!Exists('..\packages\Fody.6.3.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.3.0\build\Fody.targets'))" />
162-
</Target>
163-
<Import Project="..\packages\Fody.6.3.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.3.0\build\Fody.targets')" />
164-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
165-
Other similar extension points exist, see Microsoft.Common.targets.
166-
<Target Name="BeforeBuild">
167-
</Target>
168-
<Target Name="AfterBuild">
169-
</Target>
170-
-->
171105
</Project>

0 commit comments

Comments
 (0)