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

Build task does not depend on Greenshot.Editor.csproj anymore

Browse source
This commit is contained in:
Julien Richard 2022-10-28 14:00:23 +02:00
commit 34b9629477
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<DefineConstants>$(DefineConstants);GREENSHOT_BUILDTASKS</DefineConstants>
</PropertyGroup>
<ItemGroup> <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" /> <PackageReference Include="SixLabors.ImageSharp.Drawing" version="1.0.0-beta15" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Greenshot.Editor\Greenshot.Editor.csproj" /> <Compile Include="..\Greenshot.Editor\Controls\Emoji\Emojis.cs">
<Link>Emojis.cs</Link>
</Compile>
</ItemGroup> </ItemGroup>
<Target Name="CleanupBuildAssemblies" AfterTargets="AfterBuild"> <Target Name="CleanupBuildAssemblies" AfterTargets="AfterBuild">
<Exec Command="del $(TargetDir)\Microsoft.Build.*.dll" /> <Exec Command="del $(TargetDir)\Microsoft.Build.*.dll" />

2
src/Greenshot.Editor/Controls/Emoji/Emojis.cs
View file

@ -44,11 +44,13 @@ public class Emojis
[XmlArray(ElementName = "Es")] [XmlArray(ElementName = "Es")]
public List<Emoji> Emojis { get; set; } = new(); public List<Emoji> Emojis { get; set; } = new();
#if !GREENSHOT_BUILDTASKS
public IEnumerable<IEnumerable<Emoji>> EmojiChunkList => new ChunkHelper<Emoji>(EmojiList, 8); public IEnumerable<IEnumerable<Emoji>> EmojiChunkList => new ChunkHelper<Emoji>(EmojiList, 8);
public string Icon => SubGroups.FirstOrDefault()?.Emojis.FirstOrDefault()?.Text; public string Icon => SubGroups.FirstOrDefault()?.Emojis.FirstOrDefault()?.Text;
public IEnumerable<Emoji> EmojiList => SubGroups.SelectMany(s => s.Emojis); public IEnumerable<Emoji> EmojiList => SubGroups.SelectMany(s => s.Emojis);
#endif
} }
[XmlType("E")] [XmlType("E")]