github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-21 22:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

This fixes the Emoji feature, the emojis.xml is generated and added to the installer.

Browse source
This commit is contained in:
Robin Krom 2022-10-28 09:51:20 +02:00
commit 011e21a3f4
No known key found for this signature in database
GPG key ID: BCC01364F1371490
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
installer/innosetup/setup.iss
View file

@ -39,7 +39,7 @@ Source: {#ReleaseDir}\System.Numerics.Vectors.dll; DestDir: {app}; Components: g
Source: {#ReleaseDir}\System.Runtime.CompilerServices.Unsafe.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\System.Buffers.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\TwemojiMozilla.ttf.gz; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\emoji-test.txt.gz; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\emojis.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#GreenshotProjectDir}\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion
Source: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion

5
src/Greenshot.BuildTasks/Greenshot.BuildTasks.csproj
View file

@ -1,9 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<ItemGroup>
<PackageReference Include="Microsoft.Build.Utilities.Core" version="17.3.2" />
<PackageReference Include="Microsoft.Build.Utilities.Core" version="17.3.2"/>
<PackageReference Include="SixLabors.ImageSharp.Drawing" version="1.0.0-beta15" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Greenshot.Editor\Greenshot.Editor.csproj" />
</ItemGroup>
<Target Name="CleanupBuildAssemblies" AfterTargets="AfterBuild">
<Exec Command="del $(TargetDir)\Microsoft.Build.*.dll" />
</Target>
</Project>

2
src/Greenshot/Greenshot.csproj
View file

@ -65,7 +65,7 @@
</Task>
</UsingTask>
<UsingTask TaskName="EmojiDataTask" AssemblyFile="..\Greenshot.BuildTasks\bin\Debug\net472\Greenshot.BuildTasks.dll" />
<UsingTask TaskName="EmojiDataTask" TaskFactory="TaskHostFactory" AssemblyFile="..\Greenshot.BuildTasks\bin\Debug\net472\Greenshot.BuildTasks.dll" />
<Target Name="GenerateEmojiTestTxtFile" BeforeTargets="BeforeBuild">
<EmojiDataTask EmojiTestTxtFile="..\Greenshot.Editor\Controls\Emoji\emoji-test.txt" OutputFilename="$(SolutionDir)$(SolutionName)\$(OutDir)\emojis.xml" />