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

Fix installer

Browse source
This commit is contained in:
Julien Richard 2022-01-30 21:46:04 +01:00
commit cf89e5fb2b
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
installer/innosetup/setup.iss
View file

@ -37,6 +37,8 @@ Source: {#ReleaseDir}\System.Memory.dll; DestDir: {app}; Components: greenshot;
Source: {#ReleaseDir}\System.Numerics.Vectors.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: {#ReleaseDir}\System.Numerics.Vectors.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\System.Runtime.CompilerServices.Unsafe.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion 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}\System.Buffers.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\TwemojiMozilla.ttf; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\emoji-test.txt; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#GreenshotProjectDir}\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion Source: {#GreenshotProjectDir}\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion
Source: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion ;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion

2
src/Greenshot.Editor/Controls/EmojiData.cs
View file

@ -241,7 +241,7 @@ namespace Greenshot.Editor.Controls
private static IEnumerable<string> EmojiDescriptionLines() private static IEnumerable<string> EmojiDescriptionLines()
{ {
using var fileStream = new FileStream(Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), @"Resources\emoji-test.txt"), FileMode.Open, FileAccess.Read); using var fileStream = new FileStream(Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), @"emoji-test.txt"), FileMode.Open, FileAccess.Read);
using var streamReader = new StreamReader(fileStream); using var streamReader = new StreamReader(fileStream);
return streamReader.ReadToEnd().Split('\r', '\n'); return streamReader.ReadToEnd().Split('\r', '\n');
} }

2
src/Greenshot.Editor/Drawing/EmojiRenderer.cs
View file

@ -24,7 +24,7 @@ namespace Greenshot.Editor.Drawing
private static Lazy<FontFamily> _twemoji = new Lazy<FontFamily>(() => private static Lazy<FontFamily> _twemoji = new Lazy<FontFamily>(() =>
{ {
using var fileStream = new FileStream(Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), @"Resources\TwemojiMozilla.ttf"), FileMode.Open, FileAccess.Read); using var fileStream = new FileStream(Path.Combine(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), @"TwemojiMozilla.ttf"), FileMode.Open, FileAccess.Read);
_fontCollection.Add(fileStream); _fontCollection.Add(fileStream);
_fontCollection.TryGet("Twemoji Mozilla", out var fontFamily); _fontCollection.TryGet("Twemoji Mozilla", out var fontFamily);
return fontFamily; return fontFamily;

4
src/Greenshot.Editor/Greenshot.Editor.csproj
View file

@ -89,10 +89,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="Resources\emoji-test.txt"> <None Update="Resources\emoji-test.txt" Link="%(LinkBase)\%(Filename)%(Extension)">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Update="Resources\TwemojiMozilla.ttf"> <None Update="Resources\TwemojiMozilla.ttf" Link="%(LinkBase)\%(Filename)%(Extension)">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>