diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 655e2de21..682ff9155 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -40,26 +40,69 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_and_format; linux; Dart 3.5.0; PKGS: build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    name: "analyze_and_format; linux; Dart 3.6.0; PKG: build; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test-example-scratch_space;commands:format-analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build;commands:analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test-example-scratch_space
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
+        with:
+          sdk: "3.6.0"
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - id: build_pub_upgrade
+        name: build; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: build
+      - name: "build; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
+        working-directory: build
+  job_003:
+    name: "analyze_and_format; linux; Dart 3.6.0; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers-build_test-example-scratch_space
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - id: build_resolvers_pub_upgrade
+        name: build_resolvers; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: build_resolvers
+      - name: "build_resolvers; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
+        working-directory: build_resolvers
+      - name: "build_resolvers; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
+        working-directory: build_resolvers
       - id: build_test_pub_upgrade
         name: build_test; dart pub upgrade
         run: dart pub upgrade
@@ -99,71 +142,7 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'"
         working-directory: scratch_space
-  job_003:
-    name: "analyze_and_format; linux; Dart 3.6.0-228.0.dev; PKG: build; `dart analyze --fatal-infos .`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build;commands:analyze"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
-        with:
-          sdk: "3.6.0-228.0.dev"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_pub_upgrade
-        name: build; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build
-      - name: "build; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
-        working-directory: build
   job_004:
-    name: "analyze_and_format; linux; Dart 3.6.0; PKG: build_resolvers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers;commands:format-analyze"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
-        with:
-          sdk: "3.6.0"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_resolvers_pub_upgrade
-        name: build_resolvers; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_resolvers
-      - name: "build_resolvers; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
-        working-directory: build_resolvers
-      - name: "build_resolvers; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
-        working-directory: build_resolvers
-  job_005:
     name: "analyze_and_format; linux; Dart dev; PKGS: _test_common, build; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -202,7 +181,7 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
         working-directory: build
-  job_006:
+  job_005:
     name: "analyze_and_format; linux; Dart dev; PKG: build; `dart format --output=none --set-exit-if-changed .`"
     runs-on: ubuntu-latest
     steps:
@@ -232,7 +211,7 @@ jobs:
         run: "dart format --output=none --set-exit-if-changed ."
         if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
         working-directory: build
-  job_007:
+  job_006:
     name: "analyze_and_format; linux; Dart dev; PKGS: build_config, build_daemon, build_resolvers, build_runner, build_runner_core, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -357,7 +336,7 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'"
         working-directory: scratch_space
-  job_008:
+  job_007:
     name: "analyze_and_format; linux; Dart main; PKG: _test; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -387,7 +366,7 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps._test_pub_upgrade.conclusion == 'success'"
         working-directory: _test
-  job_009:
+  job_008:
     name: "analyze_and_format; linux; Dart main; PKGS: build_modules, build_runner, build_web_compilers; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -447,36 +426,36 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.build_web_compilers_pub_upgrade.conclusion == 'success'"
         working-directory: build_web_compilers
-  job_010:
-    name: "unit_test; linux; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`"
+  job_009:
+    name: "unit_test; linux; Dart 3.6.0; PKG: build; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_daemon;commands:test_04"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build;commands:test_04"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_daemon
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_daemon_pub_upgrade
-        name: build_daemon; dart pub upgrade
+      - id: build_pub_upgrade
+        name: build; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_daemon
-      - name: "build_daemon; dart test --test-randomize-ordering-seed=random"
+        working-directory: build
+      - name: "build; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'"
-        working-directory: build_daemon
+        if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
+        working-directory: build
     needs:
       - job_001
       - job_002
@@ -486,37 +465,36 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_011:
-    name: "unit_test; linux; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`"
+  job_010:
+    name: "unit_test; linux; Dart 3.6.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test;commands:test_04"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_daemon;commands:test_04"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:build_test
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_daemon
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_test_pub_upgrade
-        name: build_test; dart pub upgrade
+      - id: build_daemon_pub_upgrade
+        name: build_daemon; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_test
-      - name: "build_test; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_daemon
+      - name: "build_daemon; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'"
-        working-directory: build_test
+        if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'"
+        working-directory: build_daemon
     needs:
       - job_001
       - job_002
@@ -526,37 +504,36 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_012:
-    name: "unit_test; linux; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`"
+  job_011:
+    name: "unit_test; linux; Dart 3.6.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space;commands:test_04"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers;commands:test_04"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:scratch_space
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: scratch_space_pub_upgrade
-        name: scratch_space; dart pub upgrade
+      - id: build_resolvers_pub_upgrade
+        name: build_resolvers; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: scratch_space
-      - name: "scratch_space; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_resolvers
+      - name: "build_resolvers; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'"
-        working-directory: scratch_space
+        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
+        working-directory: build_resolvers
     needs:
       - job_001
       - job_002
@@ -566,37 +543,36 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_013:
-    name: "unit_test; linux; Dart 3.6.0-228.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`"
+  job_012:
+    name: "unit_test; linux; Dart 3.6.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build;commands:test_04"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_runner_core;commands:test_04"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev;packages:build
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0-228.0.dev
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_runner_core
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.6.0-228.0.dev"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_pub_upgrade
-        name: build; dart pub upgrade
+      - id: build_runner_core_pub_upgrade
+        name: build_runner_core; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build
-      - name: "build; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_runner_core
+      - name: "build_runner_core; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
-        working-directory: build
+        if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'"
+        working-directory: build_runner_core
     needs:
       - job_001
       - job_002
@@ -606,18 +582,17 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_014:
-    name: "unit_test; linux; Dart 3.6.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`"
+  job_013:
+    name: "unit_test; linux; Dart 3.6.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers;commands:test_04"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_test;commands:test_04"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_resolvers
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_test
             os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -628,15 +603,15 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_resolvers_pub_upgrade
-        name: build_resolvers; dart pub upgrade
+      - id: build_test_pub_upgrade
+        name: build_test; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_resolvers
-      - name: "build_resolvers; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_test
+      - name: "build_test; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
-        working-directory: build_resolvers
+        if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'"
+        working-directory: build_test
     needs:
       - job_001
       - job_002
@@ -646,18 +621,17 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_015:
-    name: "unit_test; linux; Dart 3.6.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`"
+  job_014:
+    name: "unit_test; linux; Dart 3.6.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_runner_core;commands:test_04"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:scratch_space;commands:test_04"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:build_runner_core
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:scratch_space
             os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -668,15 +642,15 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_runner_core_pub_upgrade
-        name: build_runner_core; dart pub upgrade
+      - id: scratch_space_pub_upgrade
+        name: scratch_space; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_runner_core
-      - name: "build_runner_core; dart test --test-randomize-ordering-seed=random"
+        working-directory: scratch_space
+      - name: "scratch_space; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'"
-        working-directory: build_runner_core
+        if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'"
+        working-directory: scratch_space
     needs:
       - job_001
       - job_002
@@ -686,8 +660,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_016:
+  job_015:
     name: "unit_test; linux; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -726,8 +699,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_017:
+  job_016:
     name: "unit_test; linux; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -766,8 +738,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_018:
+  job_017:
     name: "unit_test; linux; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -806,8 +777,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_019:
+  job_018:
     name: "unit_test; linux; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -846,8 +816,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_020:
+  job_019:
     name: "unit_test; linux; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -886,8 +855,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_021:
+  job_020:
     name: "unit_test; linux; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -926,8 +894,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_022:
+  job_021:
     name: "unit_test; linux; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -966,8 +933,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_023:
+  job_022:
     name: "unit_test; linux; Dart dev; PKG: build_runner; `dart test -P experiments --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1006,8 +972,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_024:
+  job_023:
     name: "unit_test; linux; Dart dev; PKG: build_runner; `dart test -x integration --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1046,8 +1011,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_025:
+  job_024:
     name: "unit_test; linux; Dart main; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1086,8 +1050,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_026:
+  job_025:
     name: "unit_test; linux; Dart main; PKG: _test; `dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1126,8 +1089,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_027:
+  job_026:
     name: "unit_test; linux; Dart main; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1166,8 +1128,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_028:
+  job_027:
     name: "unit_test; linux; Dart main; PKG: build_runner; `dart test -x integration --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1206,8 +1167,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_029:
+  job_028:
     name: "unit_test; linux; Dart main; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -1246,27 +1206,26 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_030:
-    name: "unit_test; windows; Dart 3.5.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`"
+  job_029:
+    name: "unit_test; windows; Dart 3.6.0; PKG: build; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_daemon_pub_upgrade
-        name: build_daemon; dart pub upgrade
+      - id: build_pub_upgrade
+        name: build; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_daemon
-      - name: "build_daemon; dart test --test-randomize-ordering-seed=random"
+        working-directory: build
+      - name: "build; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'"
-        working-directory: build_daemon
+        if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
+        working-directory: build
     needs:
       - job_001
       - job_002
@@ -1276,27 +1235,26 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_031:
-    name: "unit_test; windows; Dart 3.5.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`"
+  job_030:
+    name: "unit_test; windows; Dart 3.6.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_test_pub_upgrade
-        name: build_test; dart pub upgrade
+      - id: build_daemon_pub_upgrade
+        name: build_daemon; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_test
-      - name: "build_test; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_daemon
+      - name: "build_daemon; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'"
-        working-directory: build_test
+        if: "always() && steps.build_daemon_pub_upgrade.conclusion == 'success'"
+        working-directory: build_daemon
     needs:
       - job_001
       - job_002
@@ -1306,27 +1264,26 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_032:
-    name: "unit_test; windows; Dart 3.5.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`"
+  job_031:
+    name: "unit_test; windows; Dart 3.6.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.5.0"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: scratch_space_pub_upgrade
-        name: scratch_space; dart pub upgrade
+      - id: build_resolvers_pub_upgrade
+        name: build_resolvers; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: scratch_space
-      - name: "scratch_space; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_resolvers
+      - name: "build_resolvers; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'"
-        working-directory: scratch_space
+        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
+        working-directory: build_resolvers
     needs:
       - job_001
       - job_002
@@ -1336,27 +1293,26 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_033:
-    name: "unit_test; windows; Dart 3.6.0-228.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`"
+  job_032:
+    name: "unit_test; windows; Dart 3.6.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.6.0-228.0.dev"
+          sdk: "3.6.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_pub_upgrade
-        name: build; dart pub upgrade
+      - id: build_runner_core_pub_upgrade
+        name: build_runner_core; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build
-      - name: "build; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_runner_core
+      - name: "build_runner_core; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_pub_upgrade.conclusion == 'success'"
-        working-directory: build
+        if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'"
+        working-directory: build_runner_core
     needs:
       - job_001
       - job_002
@@ -1366,9 +1322,8 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_034:
-    name: "unit_test; windows; Dart 3.6.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`"
+  job_033:
+    name: "unit_test; windows; Dart 3.6.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
@@ -1378,15 +1333,15 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_resolvers_pub_upgrade
-        name: build_resolvers; dart pub upgrade
+      - id: build_test_pub_upgrade
+        name: build_test; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_resolvers
-      - name: "build_resolvers; dart test --test-randomize-ordering-seed=random"
+        working-directory: build_test
+      - name: "build_test; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_resolvers_pub_upgrade.conclusion == 'success'"
-        working-directory: build_resolvers
+        if: "always() && steps.build_test_pub_upgrade.conclusion == 'success'"
+        working-directory: build_test
     needs:
       - job_001
       - job_002
@@ -1396,9 +1351,8 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_035:
-    name: "unit_test; windows; Dart 3.6.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`"
+  job_034:
+    name: "unit_test; windows; Dart 3.6.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
@@ -1408,15 +1362,15 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      - id: build_runner_core_pub_upgrade
-        name: build_runner_core; dart pub upgrade
+      - id: scratch_space_pub_upgrade
+        name: scratch_space; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: build_runner_core
-      - name: "build_runner_core; dart test --test-randomize-ordering-seed=random"
+        working-directory: scratch_space
+      - name: "scratch_space; dart test --test-randomize-ordering-seed=random"
         run: "dart test --test-randomize-ordering-seed=random"
-        if: "always() && steps.build_runner_core_pub_upgrade.conclusion == 'success'"
-        working-directory: build_runner_core
+        if: "always() && steps.scratch_space_pub_upgrade.conclusion == 'success'"
+        working-directory: scratch_space
     needs:
       - job_001
       - job_002
@@ -1426,8 +1380,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_036:
+  job_035:
     name: "unit_test; windows; Dart dev; PKG: build; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1456,8 +1409,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_037:
+  job_036:
     name: "unit_test; windows; Dart dev; PKG: build_config; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1486,8 +1438,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_038:
+  job_037:
     name: "unit_test; windows; Dart dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1516,8 +1467,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_039:
+  job_038:
     name: "unit_test; windows; Dart dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1546,8 +1496,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_040:
+  job_039:
     name: "unit_test; windows; Dart dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1576,8 +1525,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_041:
+  job_040:
     name: "unit_test; windows; Dart dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1606,8 +1554,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_042:
+  job_041:
     name: "unit_test; windows; Dart dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1636,8 +1583,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_043:
+  job_042:
     name: "unit_test; windows; Dart main; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1666,8 +1612,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_044:
+  job_043:
     name: "unit_test; windows; Dart main; PKG: build_modules; `dart test -P presubmit --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1696,8 +1641,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_045:
+  job_044:
     name: "unit_test; windows; Dart main; PKG: build_web_compilers; `dart test --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -1726,8 +1670,7 @@ jobs:
       - job_006
       - job_007
       - job_008
-      - job_009
-  job_046:
+  job_045:
     name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 0 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -1802,8 +1745,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_047:
+  job_046:
     name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 1 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -1878,8 +1820,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_048:
+  job_047:
     name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 2 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -1954,8 +1895,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_049:
+  job_048:
     name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 3 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2030,8 +1970,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_050:
+  job_049:
     name: "e2e_test; linux; Dart dev; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 4 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2106,8 +2045,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_051:
+  job_050:
     name: "e2e_test; linux; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -2182,8 +2120,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_052:
+  job_051:
     name: "e2e_test; linux; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 1 --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -2258,8 +2195,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_053:
+  job_052:
     name: "e2e_test; linux; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 2 --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
@@ -2334,8 +2270,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_054:
+  job_053:
     name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 0 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2410,8 +2345,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_055:
+  job_054:
     name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 1 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2486,8 +2420,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_056:
+  job_055:
     name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 2 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2562,8 +2495,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_057:
+  job_056:
     name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 3 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2638,8 +2570,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_058:
+  job_057:
     name: "e2e_test; linux; Dart main; PKG: build_runner; `dart test -t integration --total-shards 5 --shard-index 4 --test-randomize-ordering-seed=random --no-chain-stack-traces -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -2714,8 +2645,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_059:
+  job_058:
     name: "e2e_test; windows; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -2780,8 +2710,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_060:
+  job_059:
     name: "e2e_test; windows; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 1 --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -2846,8 +2775,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_061:
+  job_060:
     name: "e2e_test; windows; Dart main; PKG: _test; `dart test --total-shards 3 --shard-index 2 --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
@@ -2912,8 +2840,7 @@ jobs:
       - job_042
       - job_043
       - job_044
-      - job_045
-  job_062:
+  job_061:
     name: "e2e_test_cron; linux; Dart main; PKG: _test; `dart test`"
     runs-on: ubuntu-latest
     if: "github.event_name == 'schedule'"
@@ -3005,8 +2932,7 @@ jobs:
       - job_058
       - job_059
       - job_060
-      - job_061
-  job_063:
+  job_062:
     name: "e2e_test_cron; windows; Dart main; PKG: _test; `dart test`"
     runs-on: windows-latest
     if: "github.event_name == 'schedule'"
@@ -3088,8 +3014,7 @@ jobs:
       - job_058
       - job_059
       - job_060
-      - job_061
-  job_064:
+  job_063:
     name: Notify failure
     runs-on: ubuntu-latest
     if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()"
@@ -3163,4 +3088,3 @@ jobs:
       - job_060
       - job_061
       - job_062
-      - job_063
diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml
index ec5ac4173..74954b46a 100644
--- a/_test/pubspec.yaml
+++ b/_test/pubspec.yaml
@@ -1,9 +1,6 @@
 name: _test
 publish_to: none
-# This package can't be part of the workspace because it needs to use the local
-# build_web_compilers, which also isn't part of the workspace. See the top-
-# level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -29,21 +26,3 @@ dev_dependencies:
   test: ^1.16.0
   test_descriptor: ^2.0.1
   test_process: ^2.0.0
-
-dependency_overrides:
-  build:
-    path: ../build
-  build_config:
-    path: ../build_config
-  build_modules:
-    path: ../build_modules
-  build_resolvers:
-    path: ../build_resolvers
-  build_runner:
-    path: ../build_runner
-  build_runner_core:
-    path: ../build_runner_core
-  build_test:
-    path: ../build_test
-  build_web_compilers:
-    path: ../build_web_compilers
diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml
index f52fca1ac..42eb87a78 100644
--- a/_test_common/pubspec.yaml
+++ b/_test_common/pubspec.yaml
@@ -1,10 +1,10 @@
 name: _test_common
 publish_to: none
 description: Test infra for writing build tests. Is not published.
-#resolution: workspace
+resolution: workspace
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   build: any
@@ -22,13 +22,3 @@ dependencies:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.1.0
-
-dependency_overrides:
-  build:
-    path: ../build
-  build_config:
-    path: ../build_config
-  build_runner_core:
-    path: ../build_runner_core
-  build_test:
-    path: ../build_test
diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md
index 503168925..ead4203b6 100644
--- a/build/CHANGELOG.md
+++ b/build/CHANGELOG.md
@@ -1,6 +1,6 @@
-## 2.4.2-wip
+## 2.4.2
 
-- Bump the min sdk to 3.6.0-228.0.dev.
+- Bump the min sdk to 3.6.0.
 - Remove some unnecessary casts and non-null assertions now that we have private
   field promotion.
 - Require analyzer ^6.9.0, allow <8.0.0.
diff --git a/build/pubspec.yaml b/build/pubspec.yaml
index 5a9b7a8da..09e9a1530 100644
--- a/build/pubspec.yaml
+++ b/build/pubspec.yaml
@@ -1,14 +1,11 @@
 name: build
-version: 2.4.2-wip
+version: 2.4.2
 description: A package for authoring build_runner compatible code generators.
 repository: https://github.com/dart-lang/build/tree/master/build
-
-# This package can't be part of the workspace because it requires a very recent
-# Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
-  sdk: ^3.6.0-228.0.dev
+  sdk: ^3.6.0
 
 dependencies:
   analyzer: '>=6.9.0 <8.0.0'
@@ -27,10 +24,6 @@ dev_dependencies:
   dart_flutter_team_lints: ^3.1.0
   test: ^1.16.0
 
-dependency_overrides:
-  build_resolvers:
-    path: ../build_resolvers
-
 topics:
  - build-runner
  - codegen
diff --git a/build_config/CHANGELOG.md b/build_config/CHANGELOG.md
index 3cd215212..4f97937ca 100644
--- a/build_config/CHANGELOG.md
+++ b/build_config/CHANGELOG.md
@@ -1,7 +1,7 @@
-## 1.1.2-wip
+## 1.1.2
 
 - Stop using deprecated `JsonKey.ignore`.
-- Bump the min sdk to 3.5.0.
+- Bump the min sdk to 3.6.0.
 
 ## 1.1.1
 
diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml
index 13bffce1c..1ee2101b9 100644
--- a/build_config/pubspec.yaml
+++ b/build_config/pubspec.yaml
@@ -1,12 +1,12 @@
 name: build_config
-version: 1.1.2-wip
+version: 1.1.2
 description: >-
   Format definition and support for parsing `build.yaml` configuration.
 repository: https://github.com/dart-lang/build/tree/master/build_config
 resolution: workspace
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   checked_yaml: ^2.0.0
diff --git a/build_daemon/CHANGELOG.md b/build_daemon/CHANGELOG.md
index 2d6d096cb..583d587fc 100644
--- a/build_daemon/CHANGELOG.md
+++ b/build_daemon/CHANGELOG.md
@@ -1,6 +1,6 @@
-## 4.0.3-wip
+## 4.0.3
 
-- Bump the min sdk to 3.5.0.
+- Bump the min sdk to 3.6.0.
 - Update to be forward compatible with changes to `package:shelf_web_socket`.
 
 ## 4.0.2
diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml
index 569886bf6..944a6d84f 100644
--- a/build_daemon/pubspec.yaml
+++ b/build_daemon/pubspec.yaml
@@ -1,11 +1,11 @@
 name: build_daemon
-version:  4.0.3-wip
+version:  4.0.3
 description: A daemon for running Dart builds.
 repository: https://github.com/dart-lang/build/tree/master/build_daemon
 resolution: workspace
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   built_collection: ^5.0.0
diff --git a/build_modules/CHANGELOG.md b/build_modules/CHANGELOG.md
index c7b8d6ff8..054f49707 100644
--- a/build_modules/CHANGELOG.md
+++ b/build_modules/CHANGELOG.md
@@ -1,5 +1,6 @@
-## 5.0.10-wip
+## 5.0.10
 
+- Bump the min sdk to 3.6.0.
 - Support analyzer version 7.x.
 
 ## 5.0.10-beta.0
diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml
index 6496da8c1..dd91ecb7b 100644
--- a/build_modules/pubspec.yaml
+++ b/build_modules/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_modules
-version: 5.0.10-wip
+version: 5.0.10
 description: >-
   Builders to analyze and split Dart code into individually compilable modules
   based on imports.
@@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_modules
 resolution: workspace
 
 environment:
-  sdk: '>=3.5.0 <3.7.0-z'
+  sdk: '>=3.6.0 <3.7.0-z'
 
 dependencies:
   analyzer: '>=5.1.0 <8.0.0'
diff --git a/build_modules/test/fixtures/a/pubspec.yaml b/build_modules/test/fixtures/a/pubspec.yaml
index 13188df16..64ac7e04d 100644
--- a/build_modules/test/fixtures/a/pubspec.yaml
+++ b/build_modules/test/fixtures/a/pubspec.yaml
@@ -1,7 +1,7 @@
 name: a
 resolution: workspace
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   b:
diff --git a/build_modules/test/fixtures/b/pubspec.yaml b/build_modules/test/fixtures/b/pubspec.yaml
index f16d108f1..53897be6e 100644
--- a/build_modules/test/fixtures/b/pubspec.yaml
+++ b/build_modules/test/fixtures/b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: b
 resolution: workspace
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   a:
diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md
index ba97b01e1..6cc86e397 100644
--- a/build_resolvers/CHANGELOG.md
+++ b/build_resolvers/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.4.3-wip
+## 2.4.3
 
 - Require the latest analyzer, and stop passing the `withNullability`
   parameter which was previously required and is now deprecated.
diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
index d93fe44ec..ba317ae84 100644
--- a/build_resolvers/pubspec.yaml
+++ b/build_resolvers/pubspec.yaml
@@ -1,11 +1,8 @@
 name: build_resolvers
-version: 2.4.3-wip
+version: 2.4.3
 description: Resolve Dart code in a Builder
 repository: https://github.com/dart-lang/build/tree/master/build_resolvers
-
-# This package can't be part of the workspace because it requires a very recent
-# Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
diff --git a/build_runner/CHANGELOG.md b/build_runner/CHANGELOG.md
index 325bdfb77..cbb514ec2 100644
--- a/build_runner/CHANGELOG.md
+++ b/build_runner/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.4.14-wip
+## 2.4.14
 
 - Write generated assets at the end of a build to avoid invalidating other
   tools with a file watcher multiple times.
diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
index 084ce1c9d..a2d90a0a6 100644
--- a/build_runner/pubspec.yaml
+++ b/build_runner/pubspec.yaml
@@ -1,8 +1,8 @@
 name: build_runner
-version: 2.4.14-wip
+version: 2.4.14
 description: A build system for Dart code generation and modular compilation.
 repository: https://github.com/dart-lang/build/tree/master/build_runner
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -20,7 +20,7 @@ dependencies:
   build_config: ">=1.1.0 <1.2.0"
   build_daemon: ^4.0.0
   build_resolvers: ^2.0.0
-  build_runner_core: ^8.0.0-wip
+  build_runner_core: ^8.0.0
   code_builder: ^4.2.0
   collection: ^1.15.0
   crypto: ^3.0.0
@@ -59,17 +59,5 @@ dev_dependencies:
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
 
-dependency_overrides:
-  build:
-    path: ../build
-  build_modules:
-    path: ../build_modules
-  build_resolvers:
-    path: ../build_resolvers
-  build_runner_core:
-    path: ../build_runner_core
-  build_web_compilers:
-    path: ../build_web_compilers
-
 topics:
  - build-runner
diff --git a/build_runner/test/integration_tests/utils/build_descriptor.dart b/build_runner/test/integration_tests/utils/build_descriptor.dart
index f91e8530e..a54c15398 100644
--- a/build_runner/test/integration_tests/utils/build_descriptor.dart
+++ b/build_runner/test/integration_tests/utils/build_descriptor.dart
@@ -235,7 +235,7 @@ d.FileDescriptor _pubspec(String name,
   var buffer = StringBuffer()
     ..writeln('name: $name')
     ..writeln('environment:')
-    ..writeln('  sdk: ^3.5.0-259.0.dev');
+    ..writeln('  sdk: ^3.6.0');
 
   void writeDeps(String group) {
     buffer.writeln(group);
diff --git a/build_runner_core/CHANGELOG.md b/build_runner_core/CHANGELOG.md
index dffc10244..ead4e59f3 100644
--- a/build_runner_core/CHANGELOG.md
+++ b/build_runner_core/CHANGELOG.md
@@ -1,10 +1,10 @@
-## 8.0.0-wip
+## 8.0.0
 
 - __Breaking__: Add `completeBuild` to `RunnerAssetWriter`, a method expected
   to be called by the build system at the end of a completed build.
 - Add `wrapInBatch` to obtain a reader/writer pair that will batch writes
   before flushing them at the end of a build.
-- Bump the min sdk to 3.6.0-dev.228.
+- Bump the min sdk to 3.6.0.
 - Require analyzer ^6.9.0, allow version 7.x.
 - Fix analyzer deprecations.
 
diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml
index 1cccc0b70..ba2f40b00 100644
--- a/build_runner_core/pubspec.yaml
+++ b/build_runner_core/pubspec.yaml
@@ -1,11 +1,11 @@
 name: build_runner_core
-version: 8.0.0-wip
+version: 8.0.0
 description: Core tools to organize the structure of a build and run Builders.
 repository: https://github.com/dart-lang/build/tree/master/build_runner_core
 
 # This package can't be part of the workspace because it requires a very recent
 # Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -49,7 +49,3 @@ dev_dependencies:
 
 topics:
  - build-runner
-
-dependency_overrides:
-  build_runner:
-    path: ../build_runner
diff --git a/build_runner_core/test/asset/batch_test.dart b/build_runner_core/test/asset/batch_test.dart
index b8f6e00a4..04a5f797b 100644
--- a/build_runner_core/test/asset/batch_test.dart
+++ b/build_runner_core/test/asset/batch_test.dart
@@ -75,7 +75,7 @@ Future<PackageGraph> _createTestPackage() async {
 name: root
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 '''),
     d.dir('lib', [
       d.file('source.dart'),
diff --git a/build_runner_core/test/fixtures/flutter_pkg/pubspec.yaml b/build_runner_core/test/fixtures/flutter_pkg/pubspec.yaml
index 8583363c7..f244f00c6 100644
--- a/build_runner_core/test/fixtures/flutter_pkg/pubspec.yaml
+++ b/build_runner_core/test/fixtures/flutter_pkg/pubspec.yaml
@@ -2,7 +2,7 @@
 # Commit: 1bdf351.
 name: flutter_gallery
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 dependencies:
   collection: '>=1.9.1 <2.0.0'
   flutter:
diff --git a/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml
index dcd07bb7b..b21c7da1a 100644
--- a/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml
+++ b/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml
@@ -1,6 +1,6 @@
 name: a
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 resolution: workspace
 dependencies:
   b:
diff --git a/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml
index 2841e02ac..a242c8b34 100644
--- a/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml
+++ b/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml
@@ -1,4 +1,4 @@
 name: b
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 resolution: workspace
diff --git a/build_runner_core/test/fixtures/workspace/pubspec.lock b/build_runner_core/test/fixtures/workspace/pubspec.lock
index f70457999..f25531142 100644
--- a/build_runner_core/test/fixtures/workspace/pubspec.lock
+++ b/build_runner_core/test/fixtures/workspace/pubspec.lock
@@ -2,4 +2,4 @@
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages: {}
 sdks:
-  dart: ">=3.5.0-259.0.dev <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
diff --git a/build_runner_core/test/fixtures/workspace/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pubspec.yaml
index a1369dda8..acc35eb89 100644
--- a/build_runner_core/test/fixtures/workspace/pubspec.yaml
+++ b/build_runner_core/test/fixtures/workspace/pubspec.yaml
@@ -1,6 +1,6 @@
 name: workspace
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 workspace:
   - pkgs/a
   - pkgs/b
diff --git a/build_test/CHANGELOG.md b/build_test/CHANGELOG.md
index 003d5e66f..9b25133bf 100644
--- a/build_test/CHANGELOG.md
+++ b/build_test/CHANGELOG.md
@@ -1,6 +1,6 @@
-## 2.2.3-wip
+## 2.2.3
 
-- Bump the min sdk to 3.5.0.
+- Bump the min sdk to 3.6.0.
 - Allow analyzer version 7.x.
 
 ## 2.2.2
diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml
index aa424c1c2..8a0719c32 100644
--- a/build_test/pubspec.yaml
+++ b/build_test/pubspec.yaml
@@ -1,11 +1,11 @@
 name: build_test
 description: Utilities for writing unit tests of Builders.
-version: 2.2.3-wip
+version: 2.2.3
 repository: https://github.com/dart-lang/build/tree/master/build_test
 resolution: workspace
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   async: ^2.5.0
diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md
index 02dbe8e64..764f009b1 100644
--- a/build_web_compilers/CHANGELOG.md
+++ b/build_web_compilers/CHANGELOG.md
@@ -1,7 +1,8 @@
-## 4.1.0-wip
+## 4.1.0
 
 - Support package:archive version 4.x.
 - Allow analyzer version 7.x.
+- Bump the min sdk to 3.6.0.
 
 ## 4.1.0-beta.3
 
diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml
index 03816936e..9b58a5c9f 100644
--- a/build_web_compilers/pubspec.yaml
+++ b/build_web_compilers/pubspec.yaml
@@ -1,10 +1,10 @@
 name: build_web_compilers
-version: 4.1.0-wip
+version: 4.1.0
 description: Builder implementations wrapping the dart2js and DDC compilers.
 repository: https://github.com/dart-lang/build/tree/master/build_web_compilers
 # This package can't be part of the workspace because it requires a very recent
 # Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: '>=3.6.0 <3.7.0-z'
@@ -42,10 +42,5 @@ dev_dependencies:
   test: ^1.16.0
   yaml: ^3.1.0
 
-# TODO: remove once this package is back in the workspace
-dependency_overrides:
-  build_modules:
-    path: ../build_modules
-
 topics:
  - build-runner
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 9ee35b684..eda633429 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,11 +1,11 @@
 name: example
 publish_to: none
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 resolution: workspace
 
 dependencies:
-  analyzer: ">=5.0.0 <7.0.0"
+  analyzer: ">=5.0.0 <8.0.0"
   build: ^2.0.0
   # Not imported in code, but used to constrain `build.yaml` requirements
   build_config: ^1.0.0
diff --git a/pubspec.yaml b/pubspec.yaml
index 93db16236..bc10a3656 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,33 +1,27 @@
 name: build_workspace     # Can be anything
 environment:
-  sdk: ^3.5.0   # Must be ^3.5.0 or later for workspace to be allowed
+  sdk: ^3.6.0
 publish_to: none
 dev_dependencies:
   dart_flutter_team_lints: ^3.1.0
 
-# build_web_compilers is not currently part of the workspace because it
-# requires a very recent version of the Dart SDK. mono_repo generates a CI
-# definition that runs each package with the lowest SDK version it supports.
-# This breaks `dart pub get` in the entire workspace, so it (and `_test` which
-# needs to use all packages from the repository) can't be part of the
-# workspace.
 workspace:
-#- _test
-#- _test/pkgs/provides_builder
-#- _test_common
-# - build
+- _test
+- _test/pkgs/provides_builder
+- _test_common
+- build
 - build_config
 - build_daemon
 - build_modules
-# - build_resolvers
-#- build_runner
-# - build_runner_core
+- build_resolvers
+- build_runner
+- build_runner_core
 - build_test
-#- build_web_compilers
+- build_web_compilers
 - example
 - scratch_space
 - tool
 - build_modules/test/fixtures/a
 - build_modules/test/fixtures/b
-#- build_web_compilers/test/fixtures/c
-#- build_web_compilers/test/fixtures/d
+- build_web_compilers/test/fixtures/c
+- build_web_compilers/test/fixtures/d
diff --git a/scratch_space/CHANGELOG.md b/scratch_space/CHANGELOG.md
index 780af7b38..474594d93 100644
--- a/scratch_space/CHANGELOG.md
+++ b/scratch_space/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 1.0.3-wip
 
-- Bump the min sdk to 3.5.0.
+- Bump the min sdk to 3.6.0.
 
 ## 1.0.2
 
diff --git a/scratch_space/pubspec.yaml b/scratch_space/pubspec.yaml
index bfccc82f4..964ea2db2 100644
--- a/scratch_space/pubspec.yaml
+++ b/scratch_space/pubspec.yaml
@@ -9,7 +9,7 @@ topics:
   - codegen
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   build: ^2.0.0
diff --git a/tool/pubspec.yaml b/tool/pubspec.yaml
index ba235188e..a521c485f 100644
--- a/tool/pubspec.yaml
+++ b/tool/pubspec.yaml
@@ -4,7 +4,7 @@ description: Collection of scripts used during development of build packages.
 resolution: workspace
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   path: ^1.8.0