From 1f8bb1bb854f1443baf451e1f70c1e31d295ca7c Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Thu, 12 Mar 2026 15:27:24 -0700
Subject: [PATCH 1/2] Prepare cherry-pick release - DevTools 2.54.2

---
 flutter-candidate.txt                   |  2 +-
 packages/devtools_app/lib/devtools.dart |  2 +-
 packages/devtools_app/pubspec.yaml      |  2 +-
 pubspec.lock                            | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flutter-candidate.txt b/flutter-candidate.txt
index b8f91c90920..dfb2b11311b 100644
--- a/flutter-candidate.txt
+++ b/flutter-candidate.txt
@@ -1 +1 @@
-71348e7b2b1b64e425fa0a3733f27d2b94ca7847
+ff37bef603469fb030f2b72995ab929ccfc227f0
diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart
index 3228209950f..067cbb96b4d 100644
--- a/packages/devtools_app/lib/devtools.dart
+++ b/packages/devtools_app/lib/devtools.dart
@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.54.1';
+const version = '2.54.2';
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
index 0a706bf7e4b..fe9edf09391 100644
--- a/packages/devtools_app/pubspec.yaml
+++ b/packages/devtools_app/pubspec.yaml
@@ -7,7 +7,7 @@ publish_to: none
 
 # Note: this version should only be updated by running the 'dt update-version'
 # command that updates the version here and in 'devtools.dart'.
-version: 2.54.1
+version: 2.54.2
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
 
diff --git a/pubspec.lock b/pubspec.lock
index 7127d25f17d..373faafb7e5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -530,10 +530,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -546,10 +546,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.18.0"
   mime:
     dependency: transitive
     description:
@@ -854,26 +854,26 @@ packages:
     dependency: transitive
     description:
       name: test
-      sha256: "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae"
+      sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.28.0"
+    version: "1.30.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.8"
+    version: "0.7.10"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4
+      sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.14"
+    version: "0.6.16"
   typed_data:
     dependency: transitive
     description:

From 9be2c887e3982e519cf58f185d5f7b008a4606e9 Mon Sep 17 00:00:00 2001
From: Elliott Brooks <21270878+elliette@users.noreply.github.com>
Date: Fri, 13 Mar 2026 08:57:40 -0700
Subject: [PATCH 2/2] Change Flutter candidate

---
 flutter-candidate.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flutter-candidate.txt b/flutter-candidate.txt
index dfb2b11311b..9905a224c9f 100644
--- a/flutter-candidate.txt
+++ b/flutter-candidate.txt
@@ -1 +1 @@
-ff37bef603469fb030f2b72995ab929ccfc227f0
+3.41.4