diff --git a/YKanBan/Assets/avalonia-logo.ico b/YKanBan/Assets/avalonia-logo.ico deleted file mode 100644 index f7da8bb..0000000 Binary files a/YKanBan/Assets/avalonia-logo.ico and /dev/null differ diff --git a/YKanBan/Assets/ykanban.ico b/YKanBan/Assets/ykanban.ico new file mode 100644 index 0000000..24f7aa4 Binary files /dev/null and b/YKanBan/Assets/ykanban.ico differ diff --git a/YKanBan/Views/MainWindow.axaml b/YKanBan/Views/MainWindow.axaml index 36f5995..5b380ad 100644 --- a/YKanBan/Views/MainWindow.axaml +++ b/YKanBan/Views/MainWindow.axaml @@ -6,7 +6,7 @@ mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="640" x:Class="YKanBan.Views.MainWindow" x:DataType="vm:MainWindowViewModel" - Icon="/Assets/avalonia-logo.ico" + Icon="/Assets/ykanban.ico" Title="{Binding Title}" Width="1000" Height="640" MinWidth="720" MinHeight="480"> diff --git a/YKanBan/YKanBan.csproj b/YKanBan/YKanBan.csproj index 27cbb97..bb6fe8b 100644 --- a/YKanBan/YKanBan.csproj +++ b/YKanBan/YKanBan.csproj @@ -7,6 +7,7 @@ enable true app.manifest + Assets\ykanban.ico true diff --git a/packaging/macos/Info.plist b/packaging/macos/Info.plist index c7bf2bd..4a2962d 100644 --- a/packaging/macos/Info.plist +++ b/packaging/macos/Info.plist @@ -8,6 +8,8 @@ YKanBan CFBundleIdentifier cn.blumia.code.yyc12345.ykanban + CFBundleIconFile + ykanban.icns CFBundleExecutable YKanBan CFBundlePackageType diff --git a/packaging/macos/ykanban.icns b/packaging/macos/ykanban.icns new file mode 100644 index 0000000..6982ff9 Binary files /dev/null and b/packaging/macos/ykanban.icns differ diff --git a/packaging/package.sh b/packaging/package.sh index 627befb..5044319 100755 --- a/packaging/package.sh +++ b/packaging/package.sh @@ -45,8 +45,9 @@ case "$rid" in ;; osx-*) app="$staging/YKanBan.app" - mkdir -p "$app/Contents/MacOS" + mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources" cp -R "$publish_dir/." "$app/Contents/MacOS/" + cp "$script_dir/macos/ykanban.icns" "$app/Contents/Resources/" chmod +x "$app/Contents/MacOS/YKanBan" sed "s/@VERSION@/${version}/g" "$script_dir/macos/Info.plist" > "$app/Contents/Info.plist" if command -v codesign > /dev/null 2>&1; then