mirror of
https://github.com/ElectronNET/Electron.NET.git
synced 2026-09-22 23:15:25 +00:00
Added support for MacOS modern app icon #1047
This commit is contained in:
@@ -313,7 +313,10 @@
|
||||
<ItemGroup>
|
||||
<!--<_ElectronFiles Include="$(ElectronIntermediatePackageJson)" />-->
|
||||
<_ElectronFiles Include="$(ElectronSplashScreen)" Condition="'$(ElectronSplashScreen)'!=''" />
|
||||
<_ElectronFiles Include="$(ElectronIcon)" Condition="'$(ElectronIcon)'!=''" />
|
||||
<_ElectronIconDirectories Include="$(ElectronIcon)"
|
||||
Condition="'$(ElectronIcon)'!='' AND Exists('$(ElectronIcon)') AND $([System.IO.Directory]::Exists('$(ElectronIcon)') )" />
|
||||
<_ElectronFiles Include="$(ElectronIcon)"
|
||||
Condition="'$(ElectronIcon)'!='' AND ( !Exists('$(ElectronIcon)') OR !$([System.IO.Directory]::Exists('$(ElectronIcon)') ) )" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -328,12 +331,25 @@
|
||||
<_ElectronFilesToCopy Include="@(_ElectronFiles->'%(FullPath)')" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_ElectronIconDirectoryFiles Include="@(_ElectronIconDirectories->'%(FullPath)\**\*')" />
|
||||
<_ElectronIconDirectoryFiles Remove="@(_ElectronIconDirectoryFiles)" Condition="$([System.IO.Directory]::Exists('%(Identity)'))" />
|
||||
<_ElectronIconDirectoryFiles Update="@(_ElectronIconDirectoryFiles)">
|
||||
<ElectronIconRelativePath>$([System.String]::Copy('%(Identity)').Replace('$([MSBuild]::EnsureTrailingSlash(%(_ElectronIconDirectories.FullPath)))', ''))</ElectronIconRelativePath>
|
||||
</_ElectronIconDirectoryFiles>
|
||||
</ItemGroup>
|
||||
|
||||
<Message Importance="High" Text="_ElectronFilesToCopy: @(_ElectronFilesToCopy)" />
|
||||
<Message Importance="High" Text="_ElectronIconDirectoryFiles: @(_ElectronIconDirectoryFiles)" />
|
||||
|
||||
<ItemGroup>
|
||||
<_ElectronFilesToCopyWithTargetPath Include="@(_ElectronFilesToCopy)">
|
||||
<TargetPath>$(ElectronDirName)\%(FileName)%(Extension)</TargetPath>
|
||||
</_ElectronFilesToCopyWithTargetPath>
|
||||
|
||||
<_ElectronFilesToCopyWithTargetPath Include="@(_ElectronIconDirectoryFiles)">
|
||||
<TargetPath>$(ElectronDirName)\$(ElectronIconFileName)\%(ElectronIconRelativePath)</TargetPath>
|
||||
</_ElectronFilesToCopyWithTargetPath>
|
||||
</ItemGroup>
|
||||
|
||||
<Message Text="_ElectronFilesToCopyWithTargetPath: @(_ElectronFilesToCopyWithTargetPath)" />
|
||||
|
||||
@@ -572,7 +572,7 @@
|
||||
|
||||
<StringProperty Name="ElectronIcon"
|
||||
DisplayName="App Icon"
|
||||
Description="Choose a ICO file to be used as application icon"
|
||||
Description="Choose an icon path for the app (e.g. .ico, .icns, or modern macOS .icon folder)"
|
||||
Subtype="File"
|
||||
Category="General">
|
||||
<StringProperty.DataSource>
|
||||
@@ -581,7 +581,7 @@
|
||||
<StringProperty.ValueEditors>
|
||||
<ValueEditor EditorType="FilePath">
|
||||
<ValueEditor.Metadata>
|
||||
<NameValuePair Name="FileTypeFilter" Value="Icon files (*.ico)|*.ico|All files (*.*)|*.*" />
|
||||
<NameValuePair Name="FileTypeFilter" Value="Icon files (*.ico,*.icns)|*.ico;*.icns|All files (*.*)|*.*" />
|
||||
</ValueEditor.Metadata>
|
||||
</ValueEditor>
|
||||
</StringProperty.ValueEditors>
|
||||
|
||||
Reference in New Issue
Block a user