Skip to content

Commit 9867f4a

Browse files
author
Sébastien Geiser
committed
Trytrytry
1 parent 7a70851 commit 9867f4a

18 files changed

+238
-955
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: 66 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,85 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<!--<Import Project="PluginInfrastructure\DllExport\NppPlugin.DllExport.targets" />-->
23
<PropertyGroup>
34
<TargetFramework>net481</TargetFramework>
4-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
55
<OutputType>Library</OutputType>
66
<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>
710
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
811
<UseWindowsForms>true</UseWindowsForms>
912
<UseWPF>true</UseWPF>
1013
<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>
1124
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13-
<OutputPath>bin\Debug</OutputPath>
14-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
17-
<OutputPath>bin\Release</OutputPath>
18-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
21-
<DefineConstants>TRACE;DEBUG;X64</DefineConstants>
22-
<OutputPath>bin\Debug-x64</OutputPath>
23-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
26-
<DefineConstants>TRACE;X64</DefineConstants>
27-
<OutputPath>bin\Release-x64</OutputPath>
28-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
29-
</PropertyGroup>
30-
<PropertyGroup>
31-
<StartAction>Program</StartAction>
32-
<StartProgram Condition="'$(Platform)'=='x64'">$(ProgramW6432)\Notepad++\notepad++.exe</StartProgram>
33-
<StartProgram Condition="'$(Platform)'=='x86'">$(MSBuildProgramFiles32)\Notepad++\notepad++.exe</StartProgram>
34-
</PropertyGroup>
25+
<UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask"
26+
AssemblyFile="NppPlugin.DllExport.MSBuild.dll"/>
27+
<Target Name="AfterBuild" DependsOnTargets="GetFrameworkPaths">
28+
<PropertyGroup>
29+
<!-- LibToolPath is optional - it's needed to debug C++, but you can still debug the C# code without it
30+
If you don't have the C++ toolchain installed this is missing, but then you can't' debug C++ anyway -->
31+
<LibToolPath Condition="Exists('$(DevEnvDir)\..\..\VC\bin')">$(DevEnvDir)\..\..\VC\bin</LibToolPath>
32+
</PropertyGroup>
33+
<DllExportTask Platform="$(Platform)"
34+
PlatformTarget="$(PlatformTarget)"
35+
CpuType="$(CpuType)"
36+
EmitDebugSymbols="$(DebugSymbols)"
37+
DllExportAttributeAssemblyName="$(DllExportAttributeAssemblyName)"
38+
DllExportAttributeFullName="$(DllExportAttributeFullName)"
39+
Timeout="$(DllExportTimeout)"
40+
KeyContainer="$(KeyContainerName)$(AssemblyKeyContainerName)"
41+
KeyFile="$(KeyOriginatorFile)"
42+
ProjectDirectory="$(MSBuildProjectDirectory)"
43+
InputFileName="$(TargetPath)"
44+
FrameworkPath="$(TargetedFrameworkDir);$(TargetFrameworkDirectory)"
45+
LibToolPath="$(LibToolPath)"
46+
LibToolDllPath="$(DevEnvDir)"
47+
SdkPath="$(SDK40ToolsPath)"/>
48+
49+
<ItemGroup>
50+
<ReleaseFiles Include="$(TargetDir)*.dll"/>
51+
<ReleaseFiles Include="$(TargetDir)*.pdb"/>
52+
</ItemGroup>
53+
<!-- $(MSBuildProgramFiles32) points to the 32 bit program files dir.
54+
On 32 bit windows usually C:\Program Files\
55+
On 64 bit windows usually C:\Program Files (x86)\
56+
$(ProgramW6432) points to the 64bit Program Files (on 32 bit windows it is blank) -->
57+
<MakeDir Directories="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\') AND !Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" />
58+
<Copy
59+
SourceFiles="@(ReleaseFiles)"
60+
DestinationFolder="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\"
61+
Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'"
62+
ContinueOnError="false" />
63+
<MakeDir Directories="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(ProgramW6432)\Notepad++\plugins\') AND !Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'" />
64+
<Copy
65+
SourceFiles="@(ReleaseFiles)"
66+
DestinationFolder="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\"
67+
Condition="Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'"
68+
ContinueOnError="false" />
69+
</Target>
70+
<ItemGroup>
71+
<None Remove="NppPlugin.DllExport.targets" />
72+
</ItemGroup>
3573
<ItemGroup>
3674
<Reference Include="System.Configuration" />
3775
<Reference Include="System.IO.Compression" />
38-
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
39-
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\..\..\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll</HintPath>
41-
</Reference>
4276
<Reference Include="System.ServiceModel" />
4377
<Reference Include="System.Transactions" />
4478
</ItemGroup>
4579
<ItemGroup>
4680
<None Update="FodyWeavers.xsd">
4781
<SubType>Designer</SubType>
4882
</None>
49-
<None Update="PluginInfrastructure\DllExport\NppPlugin.DllExport.targets">
50-
<SubType>Designer</SubType>
51-
</None>
5283
</ItemGroup>
5384
<ItemGroup>
5485
<Content Include="PluginInfrastructure\DllExport\Mono.Cecil.dll" />
@@ -60,14 +91,14 @@
6091
<Content Include="img\icon.png" />
6192
</ItemGroup>
6293
<ItemGroup>
63-
<ProjectReference Include="..\RegexDialog\RegexDialog.csproj" />
94+
<None Include="FodyWeavers.xsd" />
6495
</ItemGroup>
6596
<ItemGroup>
66-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
97+
<ProjectReference Include="..\RegexDialog\RegexDialog.csproj" />
6798
</ItemGroup>
6899
<ItemGroup>
69-
<PackageReference Include="Costura.Fody" Version="4.1.0" />
70-
<PackageReference Include="Fody" Version="6.3.0" />
100+
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
101+
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
71102
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
72103
</ItemGroup>
73104
</Project>

‎CSharpRegexTools4Npp/FodyWeavers.xsd

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
1818
</xs:annotation>
1919
</xs:element>
20+
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
21+
<xs:annotation>
22+
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
23+
</xs:annotation>
24+
</xs:element>
25+
<xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
26+
<xs:annotation>
27+
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
28+
</xs:annotation>
29+
</xs:element>
2030
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
2131
<xs:annotation>
2232
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
4353
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
4454
</xs:annotation>
4555
</xs:attribute>
56+
<xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
57+
<xs:annotation>
58+
<xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
59+
</xs:annotation>
60+
</xs:attribute>
61+
<xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
62+
<xs:annotation>
63+
<xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
64+
</xs:annotation>
65+
</xs:attribute>
4666
<xs:attribute name="DisableCompression" type="xs:boolean">
4767
<xs:annotation>
4868
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
7393
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
7494
</xs:annotation>
7595
</xs:attribute>
96+
<xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
97+
<xs:annotation>
98+
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
99+
</xs:annotation>
100+
</xs:attribute>
101+
<xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
102+
<xs:annotation>
103+
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
104+
</xs:annotation>
105+
</xs:attribute>
76106
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
77107
<xs:annotation>
78108
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

‎CSharpRegexTools4Npp/PluginInfrastructure/DllExport/NppPlugin.DllExport.targets

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<Project
2-
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
32
<UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask"
43
AssemblyFile="NppPlugin.DllExport.MSBuild.dll"/>
5-
<Target Name="AfterBuild"
6-
DependsOnTargets="GetFrameworkPaths"
7-
>
4+
<Target Name="AfterBuild" DependsOnTargets="GetFrameworkPaths">
85
<PropertyGroup>
96
<!-- LibToolPath is optional - it's needed to debug C++, but you can still debug the C# code without it
107
If you don't have the C++ toolchain installed this is missing, but then you can't' debug C++ anyway -->

‎CSharpRegexTools4Npp/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)