Merge branch 'upstream-development'

Author: pol-rivero

.github/workflows/ci.yml

@@ -68,7 +68,6 @@ jobs:
           cache: yarn
       - run: yarn
       - run: yarn validate-electron-version
-      - run: yarn validate-macos-version
       - run: yarn lint
       - run: yarn validate-changelog
       - name: Ensure a clean working directory
@@ -112,6 +111,9 @@ jobs:
         env:
           npm_config_arch: ${{ matrix.arch }}
           TARGET_ARCH: ${{ matrix.arch }}
+      - name: Validate macOS version
+        if: runner.os == 'macOS'
+        run: yarn validate-macos-version
       - name: Run desktop-trampoline tests
         run: |
           cd vendor/desktop-trampoline

app/package.json

@@ -4,7 +4,7 @@
   "productName": "GitHub Desktop Plus",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.5.4-beta1",
+  "version": "3.5.4",
   "main": "./main.js",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "desktop-trampoline": "desktop/desktop-trampoline#v0.9.10",
     "dexie": "^3.2.3",
     "dompurify": "^3.2.4",
-    "dugite": "3.0.0-rc12",
+    "dugite": "^3.0.0",
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "focus-trap-react": "^8.1.0",

app/yarn.lock

@@ -377,10 +377,10 @@ dompurify@^3.2.4:
   optionalDependencies:
     "@types/trusted-types" "^2.0.7"
 
-dugite@3.0.0-rc12:
-  version "3.0.0-rc12"
-  resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0-rc12.tgz#e4ea9b34f3d542c4d66796e68f309b31edc5d03a"
-  integrity sha512-U3nlYkfcC7y8PM+87TGWCEzyNoaHkZoPXQodZYHF0SmFM4RrcnKNaxIcN5Gi6RwOvFe6hejJXvMc8oYIJRp7hw==
+dugite@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-3.0.0.tgz#56621ad397579d9a58c10c6a4f5e646b35937046"
+  integrity sha512-+q2i3y5TvlC2YaZofkdELHtmvHbT6yuBODimItxU6xEGtHqRt6rpApJzf6lAqtpo+y1gokhfsHyULH0yNZuTWQ==
   dependencies:
     progress "^2.0.3"
     tar-stream "^3.1.7"

changelog.json

@@ -1,5 +1,32 @@
 {
   "releases": {
+    "3.5.4": [
+      "[Fixed] Update Git LFS to 3.7.1 to address CVE-2025-26625",
+      "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191",
+      "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!",
+      "[Fixed] The cancel button in the sign-in dialog is enabled after sign-in attempt - #21144. Thanks @zekariasasaminew!",
+      "[Fixed] The \"Update Email\" button in the \"Misattributed Commit\" popover works after login from a different account - #21176",
+      "[Fixed] Improve host discovery when using authenticating proxies - #19039 #19120",
+      "[Fixed] Fix diff search results highlights not visible on addition hunks - #21134",
+      "[Fixed] Add Copilot commit message generation to context menu - #21000. Thanks @zekariasasaminew!",
+      "[Fixed] Override system accent color for checkboxes and radio buttons - #21088",
+      "[Improved] The icon contrast on the pull request check run button meets minimum 3:1 contrast requirements - #21189",
+      "[Improved] Increased title bar height on macOS Tahoe - #21135. Thanks @berkcebi!",
+      "[Improved] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!",
+      "[Improved] Allow users to skip commit message override confirmation - #21025. Thanks @ilyassesalama!",
+      "[Improved] Allow generating commits with Copilot in non-GitHub repositories - #20698. Thanks @schroedermarius!"
+    ],
+    "3.5.4-beta3": [
+      "[Fixed] Updated Git LFS to 3.7.1 to address CVE-2025-26625 - #21223",
+      "[Fixed] Menu bar does not flicker when profile modal is open - #21150. Thanks @zekariasasaminew!"
+    ],
+    "3.5.4-beta2": [
+      "[Fixed] Check run status icons in the re-run checks dialog have a status tooltip that is accessible by screenreaders - #21191",
+      "[Fixed] The Whitespace hint popover appears when right-clicking diff lines while \"Hide whitespace changes\" is enabled - #20848. Thanks @zekariasasaminew!",
+      "[Fixed] The cancel button in the sign-in dialog is enabled after sign-in attempt - #21144. Thanks @zekariasasaminew!",
+      "[Fixed] The \"Update Email\" button in the \"Misattributed Commit\" popover works after login from a different account - #21176",
+      "[Improved] The icon contrast on the pull request check run button meets minimum 3:1 contrast requirements - #21189"
+    ],
     "3.5.4-beta1": [
       "[Added] Display line change count in PR Preview Dialog - #21126. Thanks @iammola!",
       "[Added] Allow users to skip commit message override confirmation - #21025. Thanks @ilyassesalama!",