Merge branch 'release/v8.20'

Author: love-linger

README.md

@@ -52,7 +52,9 @@ This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationD
 For **Windows** users:
 
 * **MSYS Git is NOT supported**. Please use official [Git for Windows](https://git-scm.com/download/win) instead.
-* `sourcegit_x.y.win-x64.zip` may be reported as virus by Windows Defender. I don't know why. I have manually tested the zip to be uploaded using Windows Defender before uploading and no virus was found. If you have installed .NET 8 SDK locally, I suggest you to compile it yourself. And if you have any idea about how to fix this, please open an issue.
+* You can install the latest stable by `winget install SourceGit`.
+  - Note: `winget` will install this software as a commandline tool. You need run `SourceGit` from console or `Win+R` at the first time. Then you can add it to the taskbar.
+* Portable versions can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 
 For **macOS** users:
 
@@ -80,9 +82,9 @@ This app supports open repository in external tools listed in the table below.
 | JetBrains Fleet | YES | YES | YES | FLEET_PATH |
 | Sublime Text | YES | YES | YES | SUBLIME_TEXT_PATH |
 
-> * You can set the given environment variable for special tool if it can NOT be found by this app automatically. 
-> * Installing `JetBrains Toolbox` will help this app to find other JetBrains tools installed on your device.
-> * On macOS, you may need to use `launchctl setenv` to make sure the app can read these environment variables.
+* You can set the given environment variable for special tool if it can NOT be found by this app automatically. 
+* Installing `JetBrains Toolbox` will help this app to find other JetBrains tools installed on your device.
+* On macOS, you may need to use `launchctl setenv` to make sure the app can read these environment variables.
 
 ## Screenshots
 
@@ -94,46 +96,9 @@ This app supports open repository in external tools listed in the table below.
 
 ![Theme Light](./screenshots/theme_light.png)
 
-## How to Customize Theme
+* Custom Themes
 
-1. Create a new json file, and provide your favorite colors with follow keys:
-
-| Key | Description |
-| --- | --- |
-| Color.Window | Window background color |
-| Color.WindowBorder | Window border color. Only used on Linux. |
-| Color.TitleBar | Title bar background color |
-| Color.ToolBar | Tool bar background color |
-| Color.Popup | Popup panel background color |
-| Color.Contents | Background color used in inputs, data grids, file content viewer, change lists, text diff viewer, etc. |
-| Color.Badge | Badge background color |
-| Color.BadgeFG | Badge foreground color |
-| Color.Conflict | Conflict panel background color |
-| Color.ConflictForeground | Conflict panel foreground color |
-| Color.Border0 | Border color used in some controls, like Window, Tab, Toolbar, etc. |
-| Color.Border1 | Border color used in inputs, like TextBox, ComboBox, etc. |
-| Color.Border2 | Border color used in visual lines, like seperators, Rectange, etc. |
-| Color.FlatButton.Background | Flat button background color, like `Cancel`, `Commit & Push` button |
-| Color.FlatButton.BackgroundHovered | Flat button background color when hovered, like `Cancel` button |
-| Color.FG1 | Primary foreground color for all text elements |
-| Color.FG2 | Secondary foreground color for all text elements |
-| Color.Diff.EmptyBG | Background color used in empty lines in diff viewer |
-| Color.Diff.AddedBG | Background color used in added lines in diff viewer |
-| Color.Diff.DeletedBG | Background color used in deleted lines in diff viewer |
-| Color.Diff.AddedHighlight | Background color used for changed words in added lines in diff viewer |
-| Color.Diff.DeletedHighlight | Background color used for changed words in deleted lines in diff viewer |
-
-For example:
-
-```json
-{
-  "Color.Window": "#FFFF6059"
-}
-```
-
-2. Open `Preference` -> `Appearance`, choose the json file you just created in `Custom Color Schema`.
-
-> **NOTE**: The `Custom Color Schema` will override the colors with same keys in current active theme.
+You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git)
 
 ## Contributing
 

VERSION

@@ -1 +1 @@
-8.19
+8.20

build/build.linux.sh

@@ -3,17 +3,16 @@
 version=`cat ../VERSION`
 
 # Cleanup
-rm -rf SourceGit *.tar.gz resources/deb/opt *.deb *.rpm
+rm -rf SourceGit *.tar.gz resources/deb/opt *.deb *.rpm *.AppImage
 
-# Compile
-dotnet publish ../src/SourceGit.csproj -c Release -r linux-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
-mv SourceGit/SourceGit SourceGit/sourcegit
-cp resources/app/App.icns SourceGit/sourcegit.icns
-rm -f SourceGit/*.dbg
+# Generic AppImage
+cd resources/appimage
+./publish-appimage -y -o sourcegit-${version}.linux.x86_64.AppImage
 
-# General Linux archive
-tar -zcvf sourcegit_${version}.linux-x64.tar.gz SourceGit
-rm -f SourceGit/sourcegit.icns
+# Move to build dir
+mv AppImages/sourcegit-${version}.linux.x86_64.AppImage ../../
+mv AppImages/AppDir/usr/bin ../../SourceGit
+cd ../../
 
 # Debain/Ubuntu package
 mkdir -p resources/deb/opt/sourcegit/