Merge branch 'sourcegit-scm:develop' into develop

Author: gadfly3173

.github/workflows/build.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Configure arm64 packages
         if: matrix.runtime == 'linux-arm64'
         run: |

.github/workflows/format-check.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Run formatting check
         run: dotnet format --verify-no-changes

.github/workflows/package.yml

@@ -22,11 +22,11 @@ jobs:
           name: sourcegit.${{ matrix.runtime }}
           path: build/SourceGit
       - name: Package
-        shell: bash
+        shell: pwsh
         env:
           VERSION: ${{ inputs.version }}
           RUNTIME: ${{ matrix.runtime }}
-        run: ./build/scripts/package.windows.sh
+        run: ./build/scripts/package.win.ps1
       - name: Upload package artifact
         uses: actions/upload-artifact@v4
         with:

.issuetracker

@@ -0,0 +1,3 @@
+[issuetracker "Github ISSUE"]
+	regex = "#(\\d+)"
+	url = https://github.com/sourcegit-scm/sourcegit/issues/$1

README.md

@@ -6,12 +6,26 @@
 [![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 [![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)](https://github.com/sourcegit-scm/sourcegit/releases)
 
+## Screenshots
+
+* Dark Theme
+
+  ![Theme Dark](./screenshots/theme_dark.png)
+
+* Light Theme
+
+  ![Theme Light](./screenshots/theme_light.png)
+
+* Custom
+
+  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git). And welcome to share your own themes.
+
 ## Highlights
 
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* Deutsch/English/Español/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil)
+* Deutsch/English/Español/Bahasa Indonesia/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil)/한국어
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph
@@ -43,7 +57,9 @@
 * Issue Link
 * Workspace
 * Custom Action
+* Create PR on GitHub/Gitlab/Gitea/Gitee/Bitbucket...
 * Using AI to generate commit message (C# port of [anjerodev/commitollama](https://github.com/anjerodev/commitollama))
+* Built-in conventional commit message helper.
 
 > [!WARNING]
 > **Linux** only tested on **Debian 12** on both **X11** & **Wayland**.
@@ -86,6 +102,12 @@ For **Windows** users:
   ```
 * Pre-built binaries can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 
+> [!NOTE]
+> `git-flow` is no longer shipped with **Git for Windows** since `2.51.1`. You can use it by following these steps:
+>  * Download [git-flow-next](https://github.com/gittower/git-flow-next/releases)
+>  * Unzip & Rename the `git-flow-next` to `git-flow`
+>  * Copy to `$GIT_INSTALL_DIR/cmd` or just add its path to you `PATH` directly
+
 For **macOS** users:
 
 * Thanks [@ybeapps](https://github.com/ybeapps) for making `SourceGit` available on `Homebrew`. You can simply install it with following command:
@@ -126,7 +148,7 @@ For **Linux** users:
 
   If your distribution isn't using `dnf`, please refer to the documentation of your distribution on how to add an `rpm` repository.
 * `AppImage` files can be found on [AppImage hub](https://appimage.github.io/SourceGit/), `xdg-open` (`xdg-utils`) must be installed to support open native file manager.
-* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your Linux.
+* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) or [git-credential-libsecret](https://pkgs.org/search/?q=git-credential-libsecret) is installed on your Linux.
 * Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI.
 * If you can NOT type accented characters, such as `ê`, `ó`, try to set the environment variable `AVALONIA_IM_MODULE` to `none`.
 
@@ -155,7 +177,7 @@ This app supports open repository in external tools listed in the table below.
 | Cursor                        | YES     | YES   | YES   |
 | Fleet                         | YES     | YES   | YES   |
 | Sublime Text                  | YES     | YES   | YES   |
-| Zed                           | NO      | YES   | YES   |
+| Zed                           | YES     | YES   | YES   |
 | Visual Studio                 | YES     | NO    | NO    |
 
 > [!NOTE]
@@ -172,19 +194,26 @@ This app supports open repository in external tools listed in the table below.
 > [!NOTE]
 > This app also supports a lot of `JetBrains` IDEs, installing `JetBrains Toolbox` will help this app to find them.
 
-## Screenshots
-
-* Dark Theme
-
-  ![Theme Dark](./screenshots/theme_dark.png)
-
-* Light Theme
-
-  ![Theme Light](./screenshots/theme_light.png)
+## Conventional Commit Helper
 
-* Custom
+You can define your own conventional commit types (per-repository) by following steps:
 
-  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git). And welcome to share your own themes.
+1. Create a json file with your own conventional commit type definitions. For example:
+```json
+[
+  {
+    "Name": "New Feature",
+    "Type": "Feature",
+    "Description": "Adding a new feature"
+  },
+  {
+    "Name": "Bug Fixes",
+    "Type": "Fix",
+    "Description": "Fixing a bug"
+  }
+]
+```
+2. Configure the `Conventional Commit Types` in repository configuration window.  
 
 ## Contributing
 

SourceGit.sln

@@ -0,0 +1,69 @@
+<Solution>
+	<Folder Name="/.github/workflows/">
+		<File Path=".github/workflows/build.yml"/>
+		<File Path=".github/workflows/ci.yml"/>
+		<File Path=".github/workflows/format-check.yml"/>
+		<File Path=".github/workflows/localization-check.yml"/>
+		<File Path=".github/workflows/package.yml"/>
+		<File Path=".github/workflows/release.yml"/>
+	</Folder>
+
+	<Folder Name="/build/resources/_common/applications/">
+		<File Path="build/resources/_common/applications/sourcegit.desktop"/>
+	</Folder>
+
+	<Folder Name="/build/resources/_common/icons/">
+		<File Path="build/resources/_common/icons/sourcegit.png"/>
+	</Folder>
+
+	<Folder Name="/build/resources/_common/">
+		<File Path="build/resources/_common/sourcegit"/>
+	</Folder>
+
+	<Folder Name="/build/resources/app/">
+		<File Path="build/resources/app/App.icns"/>
+		<File Path="build/resources/app/App.plist"/>
+	</Folder>
+
+	<Folder Name="/build/resources/appimage/">
+		<File Path="build/resources/appimage/sourcegit"/>
+		<File Path="build/resources/appimage/sourcegit.appdata.xml"/>
+	</Folder>
+
+	<Folder Name="/build/resources/deb/DEBIAN/">
+		<File Path="build/resources/deb/DEBIAN/control"/>
+		<File Path="build/resources/deb/DEBIAN/preinst"/>
+		<File Path="build/resources/deb/DEBIAN/prerm"/>
+	</Folder>
+
+	<Folder Name="/build/resources/rpm/SPECS/">
+		<File Path="build/resources/rpm/SPECS/build.spec"/>
+	</Folder>
+
+	<Folder Name="/build/scripts/">
+		<File Path="build/scripts/localization-check.js"/>
+		<File Path="build/scripts/package.linux.sh"/>
+		<File Path="build/scripts/package.osx-app.sh"/>
+		<File Path="build/scripts/package.windows.sh"/>
+	</Folder>
+
+	<Folder Name="/build/">
+		<File Path="build/README.md"/>
+	</Folder>
+
+	<Folder Name="/src/">
+		<Project Path="src/SourceGit.csproj" />
+	</Folder>
+
+	<Folder Name="/files/">
+		<File Path=".editconfig"/>
+		<File Path=".gitattributes"/>
+		<File Path=".gitignore"/>
+		<File Path=".issuetracker"/>
+		<File Path="global.json"/>
+		<File Path="LICENSE"/>
+		<File Path="README.md"/>
+		<File Path="THIRD-PARTY-LICENSES.md"/>
+		<File Path="TRANSLATION.md"/>
+	</Folder>
+</Solution>

SourceGit.slnx

@@ -7,42 +7,42 @@ The project uses the following third-party libraries or assets
 ### AvaloniaUI
 
 - **Source**: https://github.com/AvaloniaUI/Avalonia
-- **Version**: 11.2.8
+- **Version**: 11.3.9
 - **License**: MIT License
 - **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
 
 ### AvaloniaEdit
 
 - **Source**: https://github.com/AvaloniaUI/AvaloniaEdit
-- **Version**: 11.2.0
+- **Version**: 11.3.0
 - **License**: MIT License
 - **License Link**: https://github.com/AvaloniaUI/AvaloniaEdit/blob/master/LICENSE
 
 ### LiveChartsCore.SkiaSharpView.Avalonia
 
 - **Source**: https://github.com/beto-rodriguez/LiveCharts2
-- **Version**: 2.0.0-rc5.4
+- **Version**: 2.0.0-rc6.1
 - **License**: MIT License
 - **License Link**: https://github.com/beto-rodriguez/LiveCharts2/blob/master/LICENSE
 
 ### TextMateSharp
 
 - **Source**: https://github.com/danipen/TextMateSharp
-- **Version**: 1.0.66
+- **Version**: 1.0.70
 - **License**: MIT License
 - **License Link**: https://github.com/danipen/TextMateSharp/blob/master/LICENSE.md
 
 ### OpenAI .NET SDK
 
 - **Source**: https://github.com/openai/openai-dotnet
-- **Version**: 2.2.0-beta.4
+- **Version**: 2.5.0
 - **License**: MIT License
 - **License Link**: https://github.com/openai/openai-dotnet/blob/main/LICENSE
 
 ### Azure.AI.OpenAI
 
 - **Source**: https://github.com/Azure/azure-sdk-for-net
-- **Version**: 2.2.0-beta.4
+- **Version**: 2.5.0-beta.1
 - **License**: MIT License
 - **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
 
@@ -98,3 +98,10 @@ The project uses the following third-party libraries or assets
 - **Commit**: 0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355
 - **License**: MIT License
 - **License Link**: https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE
+
+### vuejs-language-tools
+
+- **Source**: https://github.com/vuejs/language-tools
+- **Commit**: 68d98dc57f8486c2946ae28dc86bf8e91d45da4d
+- **License**: MIT License
+- **License Link**: https://github.com/vuejs/language-tools/blob/68d98dc57f8486c2946ae28dc86bf8e91d45da4d/LICENSE