Skip to content

Commit 9dce12f

Browse files
author
Sébastien Geiser
committed
Version 1.2.0.0
1 parent b969bfa commit 9dce12f

File tree

4 files changed

+26
-42
lines changed

4 files changed

+26
-42
lines changed

‎CSharpRegexTools4Npp/CSharpRegexTools4Npp.csproj

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<!--<Import Project="PluginInfrastructure\DllExport\NppPlugin.DllExport.targets" />-->
32
<PropertyGroup>
3+
<OutputType>Library</OutputType>
44
<TargetFramework>net481</TargetFramework>
5-
<OutputType>Library</OutputType>
65
<LangVersion>9.0</LangVersion>
76
<AssemblyTitle>C# Regex Tools 4 Npp</AssemblyTitle>
87
<Product>C# Regex Tools 4 Npp</Product>
@@ -18,55 +17,29 @@
1817
<Nullable>disable</Nullable>
1918
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
2019
<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>
2420
</PropertyGroup>
25-
<UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask"
26-
AssemblyFile="PluginInfrastructure\DllExport\NppPlugin.DllExport.MSBuild.dll"/>
21+
<UsingTask TaskName="NppPlugin.DllExport.MSBuild.DllExportTask" AssemblyFile="PluginInfrastructure\DllExport\NppPlugin.DllExport.MSBuild.dll" />
2722
<Target Name="NppTasksPlugin" DependsOnTargets="GetFrameworkPaths" AfterTargets="PostBuildEvent">
2823
<Message Text="NppTasksPlugin" />
2924
<PropertyGroup>
3025
<!-- LibToolPath is optional - it's needed to debug C++, but you can still debug the C# code without it
3126
If you don't have the C++ toolchain installed this is missing, but then you can't' debug C++ anyway -->
3227
<LibToolPath Condition="Exists('$(DevEnvDir)\..\..\VC\bin')">$(DevEnvDir)\..\..\VC\bin</LibToolPath>
3328
</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)"/>
29+
<DllExportTask Platform="$(Platform)" PlatformTarget="$(PlatformTarget)" CpuType="$(CpuType)" EmitDebugSymbols="$(DebugSymbols)" DllExportAttributeAssemblyName="$(DllExportAttributeAssemblyName)" DllExportAttributeFullName="$(DllExportAttributeFullName)" Timeout="$(DllExportTimeout)" KeyContainer="$(KeyContainerName)$(AssemblyKeyContainerName)" KeyFile="$(KeyOriginatorFile)" ProjectDirectory="$(MSBuildProjectDirectory)" InputFileName="$(TargetPath)" FrameworkPath="$(TargetedFrameworkDir);$(TargetFrameworkDirectory)" LibToolPath="$(LibToolPath)" LibToolDllPath="$(DevEnvDir)" SdkPath="$(SDK40ToolsPath)" />
4930

5031
<ItemGroup>
51-
<ReleaseFiles Include="$(TargetDir)*.dll"/>
52-
<ReleaseFiles Include="$(TargetDir)*.pdb"/>
32+
<ReleaseFiles Include="$(TargetDir)CSharpRegexTools4Npp.dll" />
33+
<!--<ReleaseFiles Include="$(TargetDir)*.pdb" />-->
5334
</ItemGroup>
5435
<!-- $(MSBuildProgramFiles32) points to the 32 bit program files dir.
5536
On 32 bit windows usually C:\Program Files\
5637
On 64 bit windows usually C:\Program Files (x86)\
5738
$(ProgramW6432) points to the 64bit Program Files (on 32 bit windows it is blank) -->
5839
<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" />
40+
<Copy SourceFiles="@(ReleaseFiles)" DestinationFolder="$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(MSBuildProgramFiles32)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x86'" ContinueOnError="false" />
6441
<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" />
42+
<Copy SourceFiles="@(ReleaseFiles)" DestinationFolder="$(ProgramW6432)\Notepad++\plugins\$(TargetName)\" Condition="Exists('$(ProgramW6432)\Notepad++\plugins\$(TargetName)\') AND '$(Platform)'=='x64'" ContinueOnError="false" />
7043
</Target>
7144
<ItemGroup>
7245
<None Remove="NppPlugin.DllExport.targets" />
@@ -98,8 +71,14 @@
9871
<ProjectReference Include="..\RegexDialog\RegexDialog.csproj" />
9972
</ItemGroup>
10073
<ItemGroup>
101-
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
102-
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
74+
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all">
75+
<PrivateAssets>all</PrivateAssets>
76+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
77+
</PackageReference>
78+
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
79+
<PrivateAssets>all</PrivateAssets>
80+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
81+
</PackageReference>
10382
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
10483
</ItemGroup>
10584
</Project>

‎CSharpRegexTools4Npp/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private static async void CheckUpdates(RegExToolDialog dialog)
131131
var jsonResult = JObject.Parse(responseText);
132132

133133
int[] latestVersion = jsonResult["name"].ToString().Split('.').Select(digit => int.Parse(digit.Trim())).ToArray();
134-
int[] currentVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Select(digit => int.Parse(digit.Trim())).ToArray();
134+
int[] currentVersion = typeof(RegExToolDialog).Assembly.GetName().Version.ToString().Split('.').Select(digit => int.Parse(digit.Trim())).ToArray();
135135

136136
Debug.WriteLine($"{latestVersion} - {currentVersion}");
137137

‎RegexDialog/RegExToolDialog.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public RegExToolDialog()
220220

221221
InitializeComponent();
222222

223-
Title += $" - {Assembly.GetCallingAssembly().GetName().Version}";
223+
Title += $" - {Assembly.GetExecutingAssembly().GetName().Version}";
224224

225225
Init();
226226
}

‎RegexDialog/RegexDialog.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<PropertyGroup>
33
<TargetFramework>net481</TargetFramework>
44
<OutputType>Library</OutputType>
5+
<AssemblyVersion>1.2.0.0</AssemblyVersion>
6+
<FileVersion>1.2.0.0</FileVersion>
57
<LangVersion>9.0</LangVersion>
68
<UseWindowsForms>true</UseWindowsForms>
79
<UseWPF>true</UseWPF>
@@ -10,9 +12,12 @@
1012
<Nullable>disable</Nullable>
1113
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
1214
<Platforms>x64;x86</Platforms>
13-
<Version>1.1.11.0</Version>
14-
<AssemblyVersion>1.1.11.0</AssemblyVersion>
15-
<FileVersion>1.1.11.0</FileVersion>
15+
</PropertyGroup>
16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
17+
<Optimize>False</Optimize>
18+
</PropertyGroup>
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
20+
<Optimize>False</Optimize>
1621
</PropertyGroup>
1722
<ItemGroup>
1823
<None Include="FodyWeavers.xsd" />
@@ -91,7 +96,7 @@
9196
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
9297
<PackageReference Include="Ookii.Dialogs.WinForms" Version="4.0.0" />
9398
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
94-
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all"/>
99+
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
95100
<PackageReference Include="SixLabors.Fonts" Version="1.0.0" />
96101
<PackageReference Include="System.AppContext" Version="4.3.0" />
97102
<PackageReference Include="System.Buffers" Version="4.5.1" />

0 commit comments

Comments
 (0)