From 3e5327a02693b1405359dc5322d7f0a40151b9b7 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <43759233+kenzieschmoll@users.noreply.github.com>
Date: Tue, 26 Nov 2024 16:23:47 -0800
Subject: [PATCH] Prepare for release 2.41.0 (#8564)

* Prepare for release 2.41.0

* update flutter version and release instructions
---
 flutter-candidate.txt                   |  2 +-
 packages/devtools_app/lib/devtools.dart |  2 +-
 packages/devtools_app/pubspec.yaml      |  2 +-
 tool/RELEASE_INSTRUCTIONS.md            | 18 ++++++------------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/flutter-candidate.txt b/flutter-candidate.txt
index 95e8a02d8a2..71faf5cfa20 100644
--- a/flutter-candidate.txt
+++ b/flutter-candidate.txt
@@ -1 +1 @@
-1d01955721fbb5a3cde5beb6e0a0216b457d35ae
+1e824af6bd217beb0cc201394c9832316b6150da
diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart
index 00c8be34c09..b3dfa1546c7 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.41.0-dev.3';
+const version = '2.41.0';
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml
index f16c4598b24..e6edfb22ea5 100644
--- a/packages/devtools_app/pubspec.yaml
+++ b/packages/devtools_app/pubspec.yaml
@@ -4,7 +4,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.41.0-dev.3
+version: 2.41.0
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
 
diff --git a/tool/RELEASE_INSTRUCTIONS.md b/tool/RELEASE_INSTRUCTIONS.md
index 5f065b4a24f..af4cd07235e 100644
--- a/tool/RELEASE_INSTRUCTIONS.md
+++ b/tool/RELEASE_INSTRUCTIONS.md
@@ -69,9 +69,13 @@ Make sure:
    git checkout main; git rebase-update
    ```
 
-> Note: Until https://github.com/flutter/devtools/issues/7939, skip this step.
+2. Your Flutter SDK in `devtools/tool/flutter-sdk` and the one on PATH are updated to the latest candidate release branch.
 
-2. Your Flutter SDK in `devtools/tool/flutter-sdk` and the one on PATH are updated to the latest candidate release branch:
+   **The following is required until https://github.com/flutter/devtools/issues/7939 is fixed:**
+   - Update the `flutter-candidate.txt` to the latest Flutter candidate in g3 (see instructions in DevTools Release Rotation email).
+   This change should get committed with the DevTools release PR so that we know which version it was released with.
+
+   Now, update your Flutter SDK in `devtools/tool/flutter-sdk` and the one on PATH to the latest Flutter candidate:
    ```shell
    dt update-flutter-sdk --update-on-path
    ```
@@ -91,16 +95,6 @@ dt release-helper
 This command will automatically:
    - create a new branch using the tip of master and check out locally
    - create a PR for release changes
-   - update your local version of flutter to the latest flutter candidate
-
-**The following is required until https://github.com/flutter/devtools/issues/7939 is fixed:**
-
-1. Update the `flutter-candidate.txt` to the latest Flutter candidate in g3 (see instructions in DevTools Release Rotation email). This change should get committed with the DevTools release PR so that we know which version it was released with.
-
-2. Update your Flutter SDK in `devtools/tool/flutter-sdk` and the one on PATH to the latest Flutter candidate:
-   ```shell
-   dt update-flutter-sdk --update-on-path --use-cache
-   ```
 
 #### Verify the version changes for the Release PR