diff --git a/.gitignore b/.gitignore
index 2be1232147d..a29bb37f87f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,8 +81,12 @@ pubspec.lock
 # Files for native assets auto-generated per checkout.
 /.dart_tool/native_assets_builder/
 
-# The top level package file (this is auto-generated per checkout).
-/.dart_tool/package_config.json
+# Files generated by pub and other dart tools.
+/.dart_tool/
+
+# Generated by tools/generate_package_config.dart to include extra packages in
+# the project.
+pubspec_overrides.yaml
 
 # Local pub storage
 .pub
diff --git a/pkg/_js_interop_checks/pubspec.yaml b/pkg/_js_interop_checks/pubspec.yaml
index 1b66933b373..4e299a32916 100644
--- a/pkg/_js_interop_checks/pubspec.yaml
+++ b/pkg/_js_interop_checks/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 
 environment:
   # Use min prerelease bound to get the latest formatter changes.
-  sdk: '^3.7.0-0'
+  sdk: '^3.7.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml
index 1c5bf996b8f..cea36d5cdb0 100644
--- a/pkg/analysis_server/pubspec.yaml
+++ b/pkg/analysis_server/pubspec.yaml
@@ -3,7 +3,7 @@ name: analysis_server
 publish_to: none
 
 environment:
-  sdk: '>=3.7.0-edge <4.0.0'
+  sdk: '^3.7.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/analysis_server_client/pubspec.yaml b/pkg/analysis_server_client/pubspec.yaml
index 1f7d5d5397c..afc1a20aad2 100644
--- a/pkg/analysis_server_client/pubspec.yaml
+++ b/pkg/analysis_server_client/pubspec.yaml
@@ -10,7 +10,7 @@ repository: https://github.com/dart-lang/sdk/tree/main/pkg/analysis_server_clien
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/analyzer_cli/pubspec.yaml b/pkg/analyzer_cli/pubspec.yaml
index 93b7ef92da3..0607768da6d 100644
--- a/pkg/analyzer_cli/pubspec.yaml
+++ b/pkg/analyzer_cli/pubspec.yaml
@@ -5,7 +5,7 @@ description: Command line interface for the Dart Analyzer.
 publish_to: none
 
 environment:
-  sdk: '>=3.7.0-edge <4.0.0'
+  sdk: ^3.7.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/analyzer_utilities/pubspec.yaml b/pkg/analyzer_utilities/pubspec.yaml
index 368909922f4..90a36b9eefb 100644
--- a/pkg/analyzer_utilities/pubspec.yaml
+++ b/pkg/analyzer_utilities/pubspec.yaml
@@ -3,7 +3,7 @@ name: analyzer_utilities
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/async_helper/pubspec.yaml b/pkg/async_helper/pubspec.yaml
index f2b92e73938..6fea2df39a7 100644
--- a/pkg/async_helper/pubspec.yaml
+++ b/pkg/async_helper/pubspec.yaml
@@ -9,7 +9,7 @@ description: >-
  provided in package:test.
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/bisect_dart/pubspec.yaml b/pkg/bisect_dart/pubspec.yaml
index 71894edd89a..fde83263b4b 100644
--- a/pkg/bisect_dart/pubspec.yaml
+++ b/pkg/bisect_dart/pubspec.yaml
@@ -3,7 +3,7 @@ name: bisect_dart
 publish_to: none
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.5.0
 
 dependencies:
   cli_config: any
diff --git a/pkg/build_integration/pubspec.yaml b/pkg/build_integration/pubspec.yaml
index cd5c53d6a3a..bbf5cf8c114 100644
--- a/pkg/build_integration/pubspec.yaml
+++ b/pkg/build_integration/pubspec.yaml
@@ -6,7 +6,7 @@ description: >
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/compiler/pubspec.yaml b/pkg/compiler/pubspec.yaml
index 1d9ba93786a..2904d969573 100644
--- a/pkg/compiler/pubspec.yaml
+++ b/pkg/compiler/pubspec.yaml
@@ -4,7 +4,7 @@ name: compiler
 # This package is not intended for consumption on pub.dev. DO NOT publish.
 publish_to: none
 environment:
-  sdk: '^3.7.0-0'
+  sdk: '^3.7.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/dart2bytecode/pubspec.yaml b/pkg/dart2bytecode/pubspec.yaml
index 65c6821daee..8f128ab0062 100644
--- a/pkg/dart2bytecode/pubspec.yaml
+++ b/pkg/dart2bytecode/pubspec.yaml
@@ -3,7 +3,7 @@ name: dart2bytecode
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/dart2js_info/pubspec.yaml b/pkg/dart2js_info/pubspec.yaml
index d09fb8710ee..0101ed0176d 100644
--- a/pkg/dart2js_info/pubspec.yaml
+++ b/pkg/dart2js_info/pubspec.yaml
@@ -6,7 +6,7 @@ description: >-
   --dump-info.
 
 environment:
-  sdk: '^3.7.0-0'
+  sdk: '^3.7.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/dart2js_runtime_metrics/pubspec.yaml b/pkg/dart2js_runtime_metrics/pubspec.yaml
index 5f72158a5a9..d02f25c4a07 100644
--- a/pkg/dart2js_runtime_metrics/pubspec.yaml
+++ b/pkg/dart2js_runtime_metrics/pubspec.yaml
@@ -7,7 +7,7 @@ description: >-
   This library provides access to the measurements at runtime.
 
 environment:
-  sdk: "^3.7.0-0"
+  sdk: "^3.7.0"
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
diff --git a/pkg/dart2js_tools/pubspec.yaml b/pkg/dart2js_tools/pubspec.yaml
index c5ab87d6466..ca19fe6400e 100644
--- a/pkg/dart2js_tools/pubspec.yaml
+++ b/pkg/dart2js_tools/pubspec.yaml
@@ -6,7 +6,7 @@ description: >
   information, deobfuscation of stack-traces and minified names.
 
 environment:
-  sdk: '^3.7.0-0'
+  sdk: '^3.7.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/dart2native/pubspec.yaml b/pkg/dart2native/pubspec.yaml
index 7cd1f766378..3d8c882132b 100644
--- a/pkg/dart2native/pubspec.yaml
+++ b/pkg/dart2native/pubspec.yaml
@@ -3,7 +3,7 @@ name: dart2native
 publish_to: none
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.5.0
 
 # Add the bin/dart2native.dart script to the scripts pub installs.
 executables:
diff --git a/pkg/dart2wasm/pubspec.yaml b/pkg/dart2wasm/pubspec.yaml
index 8bcbddfc007..b546c5681f0 100644
--- a/pkg/dart2wasm/pubspec.yaml
+++ b/pkg/dart2wasm/pubspec.yaml
@@ -2,7 +2,7 @@ name: dart2wasm
 # This package is not intended for consumption on pub.dev. DO NOT publish.
 publish_to: none
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/dtd_impl/pubspec.yaml b/pkg/dtd_impl/pubspec.yaml
index 8b54b9c4739..ffad53f5797 100644
--- a/pkg/dtd_impl/pubspec.yaml
+++ b/pkg/dtd_impl/pubspec.yaml
@@ -4,7 +4,7 @@ repository: https://github.com/dart-lang/sdk/tree/main/pkg/dtd_impl
 publish_to: none
 
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/dynamic_modules/pubspec.yaml b/pkg/dynamic_modules/pubspec.yaml
index da3f449be08..e7cb25aab94 100644
--- a/pkg/dynamic_modules/pubspec.yaml
+++ b/pkg/dynamic_modules/pubspec.yaml
@@ -3,7 +3,7 @@ name: dynamic_modules
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
diff --git a/pkg/expect/pubspec.yaml b/pkg/expect/pubspec.yaml
index 1c0fb19c049..570f3fc6407 100644
--- a/pkg/expect/pubspec.yaml
+++ b/pkg/expect/pubspec.yaml
@@ -10,7 +10,7 @@ description: >-
 publish_to: none
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/front_end/pubspec.yaml b/pkg/front_end/pubspec.yaml
index 0f321c657b7..a12e09d7702 100644
--- a/pkg/front_end/pubspec.yaml
+++ b/pkg/front_end/pubspec.yaml
@@ -6,7 +6,7 @@ name: front_end
 publish_to: none
 
 environment:
-  sdk: ^3.3.0-0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/frontend_server/lib/src/strong_components.dart b/pkg/frontend_server/lib/src/strong_components.dart
index 2de70001116..08121172430 100644
--- a/pkg/frontend_server/lib/src/strong_components.dart
+++ b/pkg/frontend_server/lib/src/strong_components.dart
@@ -120,7 +120,7 @@ class _LibraryGraph implements Graph<Library> {
             !dependency.targetLibrary.importUri.isScheme('dart'))
           _partialComponent == null
               ? dependency.targetLibrary
-              : _partialComponent![dependency.targetLibrary.importUri] ??
+              : _partialComponent[dependency.targetLibrary.importUri] ??
                   dependency.targetLibrary
     ];
   }
diff --git a/pkg/frontend_server/pubspec.yaml b/pkg/frontend_server/pubspec.yaml
index 75431eb296d..889783e7d51 100644
--- a/pkg/frontend_server/pubspec.yaml
+++ b/pkg/frontend_server/pubspec.yaml
@@ -4,7 +4,7 @@ description: A resident kernel compiler
 publish_to: none
 
 environment:
-  sdk: '^3.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/heap_snapshot/pubspec.yaml b/pkg/heap_snapshot/pubspec.yaml
index 2e49191d442..6858d125a00 100644
--- a/pkg/heap_snapshot/pubspec.yaml
+++ b/pkg/heap_snapshot/pubspec.yaml
@@ -3,7 +3,7 @@ name: heap_snapshot
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: ^3.5.0
 
 dependencies:
   vm_service: any
diff --git a/pkg/js_ast/pubspec.yaml b/pkg/js_ast/pubspec.yaml
index 02944c18213..ae333c557d9 100644
--- a/pkg/js_ast/pubspec.yaml
+++ b/pkg/js_ast/pubspec.yaml
@@ -3,7 +3,7 @@ name: js_ast
 publish_to: none
 
 environment:
-  sdk: '^3.7.0-0'
+  sdk: '^3.7.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
diff --git a/pkg/js_runtime/pubspec.yaml b/pkg/js_runtime/pubspec.yaml
index 2b25fa3afe0..b529be7dd9e 100644
--- a/pkg/js_runtime/pubspec.yaml
+++ b/pkg/js_runtime/pubspec.yaml
@@ -3,7 +3,7 @@ name: js_runtime
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
diff --git a/pkg/js_shared/pubspec.yaml b/pkg/js_shared/pubspec.yaml
index 43fe85eef32..6c51a5f7085 100644
--- a/pkg/js_shared/pubspec.yaml
+++ b/pkg/js_shared/pubspec.yaml
@@ -3,7 +3,7 @@ name: js_shared
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
diff --git a/pkg/linter/pubspec.yaml b/pkg/linter/pubspec.yaml
index 4db335d6ddd..6e22ddbe516 100644
--- a/pkg/linter/pubspec.yaml
+++ b/pkg/linter/pubspec.yaml
@@ -7,7 +7,7 @@ description: >-
   This package is not intended to be used directly.
 
 environment:
-  sdk: '>=3.7.0-edge <4.0.0'
+  sdk: ^3.7.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/mmap/pubspec.yaml b/pkg/mmap/pubspec.yaml
index b8bfb15ff0f..bc2e4997309 100644
--- a/pkg/mmap/pubspec.yaml
+++ b/pkg/mmap/pubspec.yaml
@@ -4,7 +4,7 @@ name: mmap
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/modular_test/pubspec.yaml b/pkg/modular_test/pubspec.yaml
index 505ca79fdbf..d54ad6cb007 100644
--- a/pkg/modular_test/pubspec.yaml
+++ b/pkg/modular_test/pubspec.yaml
@@ -7,7 +7,7 @@ description: >
  pipeline of different SDK tools.
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/node_preamble/pubspec.yaml b/pkg/node_preamble/pubspec.yaml
index 67a7fbdcf76..d013607aa47 100644
--- a/pkg/node_preamble/pubspec.yaml
+++ b/pkg/node_preamble/pubspec.yaml
@@ -1,5 +1,5 @@
 # This is just a stub, not the real node_preamble package
 name: node_preamble
 environment:
-  sdk: ^3.7.0-0
+  sdk: ^3.7.0
 publish_to: none
diff --git a/pkg/scrape/pubspec.yaml b/pkg/scrape/pubspec.yaml
index 9eee8f96d36..38364e395ae 100644
--- a/pkg/scrape/pubspec.yaml
+++ b/pkg/scrape/pubspec.yaml
@@ -4,7 +4,7 @@ description: Helper package for analyzing the syntax of Dart programs.
 publish_to: none
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/server_plugin/pubspec.yaml b/pkg/server_plugin/pubspec.yaml
index 2ce180e5074..493848eb13f 100644
--- a/pkg/server_plugin/pubspec.yaml
+++ b/pkg/server_plugin/pubspec.yaml
@@ -3,7 +3,7 @@ name: server_plugin
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/smith/lib/configuration.dart b/pkg/smith/lib/configuration.dart
index e8553587d5b..91bc39a5711 100644
--- a/pkg/smith/lib/configuration.dart
+++ b/pkg/smith/lib/configuration.dart
@@ -760,7 +760,7 @@ class Architecture extends NamedEnum {
     throw ArgumentError('Unknown architecture "$name".');
   }
 
-  const Architecture._(String name) : super(name);
+  const Architecture._(super.name);
 
   bool get isSimulator => _simulators.contains(this);
   static final _simulators = <Architecture>{
@@ -848,7 +848,7 @@ class Compiler extends NamedEnum {
     throw ArgumentError('Unknown compiler "$name".');
   }
 
-  const Compiler._(String name) : super(name);
+  const Compiler._(super.name);
 
   /// Gets the runtimes this compiler can target.
   List<Runtime> get supportedRuntimes {
@@ -968,7 +968,7 @@ class Mode extends NamedEnum {
     throw ArgumentError('Unknown mode "$name".');
   }
 
-  const Mode._(String name) : super(name);
+  const Mode._(super.name);
 
   bool get isDebug => this == debug;
 }
@@ -994,7 +994,7 @@ class Sanitizer extends NamedEnum {
     throw ArgumentError('Unknown sanitizer "$name".');
   }
 
-  const Sanitizer._(String name) : super(name);
+  const Sanitizer._(super.name);
 }
 
 class Runtime extends NamedEnum {
@@ -1041,7 +1041,7 @@ class Runtime extends NamedEnum {
     throw ArgumentError('Unknown runtime "$name".');
   }
 
-  const Runtime._(String name) : super(name);
+  const Runtime._(super.name);
 
   bool get isBrowser => const [
         ie9,
@@ -1131,7 +1131,7 @@ class System extends NamedEnum {
     throw ArgumentError('Unknown operating system "$name".');
   }
 
-  const System._(String name) : super(name);
+  const System._(super.name);
 
   /// The root directory name for build outputs on this system.
   String get outputDirectory {
@@ -1178,7 +1178,7 @@ class NnbdMode extends NamedEnum {
     throw ArgumentError('Unknown NNBD mode "$name".');
   }
 
-  const NnbdMode._(String name) : super(name);
+  const NnbdMode._(super.name);
 }
 
 /// Base class for an enum-like class whose values are identified by name.
diff --git a/pkg/smith/pubspec.yaml b/pkg/smith/pubspec.yaml
index 995e14a2be9..a5d9f042a93 100644
--- a/pkg/smith/pubspec.yaml
+++ b/pkg/smith/pubspec.yaml
@@ -4,7 +4,7 @@ description: Shared code for working with the Dart SDK's tests and test runner.
 publish_to: none
 
 environment:
-  sdk: '^2.12.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependencies:
diff --git a/pkg/sourcemap_testing/pubspec.yaml b/pkg/sourcemap_testing/pubspec.yaml
index fcba5ab2698..3ca32331d6d 100644
--- a/pkg/sourcemap_testing/pubspec.yaml
+++ b/pkg/sourcemap_testing/pubspec.yaml
@@ -4,7 +4,7 @@ name: sourcemap_testing
 publish_to: none
 
 environment:
-  sdk: ^3.7.0-0
+  sdk: ^3.7.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/status_file/pubspec.yaml b/pkg/status_file/pubspec.yaml
index 43930c808fb..daa7a5b6ddf 100644
--- a/pkg/status_file/pubspec.yaml
+++ b/pkg/status_file/pubspec.yaml
@@ -3,7 +3,7 @@ name: status_file
 publish_to: none
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/telemetry/pubspec.yaml b/pkg/telemetry/pubspec.yaml
index 8947f05064b..0c0f1cf7d8f 100644
--- a/pkg/telemetry/pubspec.yaml
+++ b/pkg/telemetry/pubspec.yaml
@@ -4,7 +4,7 @@ description: A library to facilitate reporting analytics and crash reports.
 publish_to: none
 
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/test_runner/pubspec.yaml b/pkg/test_runner/pubspec.yaml
index f0b01c9c76f..15c40890fc7 100644
--- a/pkg/test_runner/pubspec.yaml
+++ b/pkg/test_runner/pubspec.yaml
@@ -7,7 +7,7 @@ name: test_runner
 publish_to: none
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/testing/lib/src/analyze.dart b/pkg/testing/lib/src/analyze.dart
index 4dde1fef16e..d7238ce43ed 100644
--- a/pkg/testing/lib/src/analyze.dart
+++ b/pkg/testing/lib/src/analyze.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.analyze;
+library;
 
 import 'dart:async' show Stream, Future;
 
diff --git a/pkg/testing/lib/src/chain.dart b/pkg/testing/lib/src/chain.dart
index 55037c4a148..eac11745bc1 100644
--- a/pkg/testing/lib/src/chain.dart
+++ b/pkg/testing/lib/src/chain.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.chain;
+library;
 
 import 'dart:convert' show json, JsonEncoder;
 
diff --git a/pkg/testing/lib/src/discover.dart b/pkg/testing/lib/src/discover.dart
index 6ec493a4078..04fe42fa0e2 100644
--- a/pkg/testing/lib/src/discover.dart
+++ b/pkg/testing/lib/src/discover.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.discover;
+library;
 
 import 'dart:io' show Directory, FileSystemEntity, Platform, Process;
 
diff --git a/pkg/testing/lib/src/error_handling.dart b/pkg/testing/lib/src/error_handling.dart
index 1517bc738d6..6c6fbe4bdd8 100644
--- a/pkg/testing/lib/src/error_handling.dart
+++ b/pkg/testing/lib/src/error_handling.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.error_handling;
+library;
 
 import 'dart:async' show Future;
 
diff --git a/pkg/testing/lib/src/expectation.dart b/pkg/testing/lib/src/expectation.dart
index 4a36e49cf5f..07f2939f51c 100644
--- a/pkg/testing/lib/src/expectation.dart
+++ b/pkg/testing/lib/src/expectation.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.expectation;
+library;
 
 /// An expectation represents the expected outcome of a test (or if it should
 /// be skipped).
diff --git a/pkg/testing/lib/src/log.dart b/pkg/testing/lib/src/log.dart
index f720d673eac..f85dd3c01c9 100644
--- a/pkg/testing/lib/src/log.dart
+++ b/pkg/testing/lib/src/log.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.log;
+library;
 
 import 'dart:io' show stdout;
 
diff --git a/pkg/testing/lib/src/run.dart b/pkg/testing/lib/src/run.dart
index 86a24e15866..f015be3706a 100644
--- a/pkg/testing/lib/src/run.dart
+++ b/pkg/testing/lib/src/run.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.run;
+library;
 
 import 'dart:async' show Future, Stream;
 
diff --git a/pkg/testing/lib/src/run_tests.dart b/pkg/testing/lib/src/run_tests.dart
index af6cee590f9..1ca735ea202 100644
--- a/pkg/testing/lib/src/run_tests.dart
+++ b/pkg/testing/lib/src/run_tests.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.run_tests;
+library;
 
 import 'dart:async' show Future;
 
diff --git a/pkg/testing/lib/src/status_file_parser.dart b/pkg/testing/lib/src/status_file_parser.dart
index a3b2afc7e49..362626cf76b 100644
--- a/pkg/testing/lib/src/status_file_parser.dart
+++ b/pkg/testing/lib/src/status_file_parser.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test_dart_copy.status_file_parser;
+library;
 
 import "dart:io";
 
diff --git a/pkg/testing/lib/src/stdio_process.dart b/pkg/testing/lib/src/stdio_process.dart
index e87543b6849..2f2c6ab3a53 100644
--- a/pkg/testing/lib/src/stdio_process.dart
+++ b/pkg/testing/lib/src/stdio_process.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.stdio_process;
+library;
 
 import 'dart:async' show EventSink, Future, Stream, StreamTransformer, Timer;
 
diff --git a/pkg/testing/lib/src/suite.dart b/pkg/testing/lib/src/suite.dart
index 66d9e79eabf..8aa37ad1882 100644
--- a/pkg/testing/lib/src/suite.dart
+++ b/pkg/testing/lib/src/suite.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.suite;
+library;
 
 import 'chain.dart' show Chain;
 
diff --git a/pkg/testing/lib/src/test_description.dart b/pkg/testing/lib/src/test_description.dart
index e6852a0e903..a76e40c9f33 100644
--- a/pkg/testing/lib/src/test_description.dart
+++ b/pkg/testing/lib/src/test_description.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.test_description;
+library;
 
 import 'dart:io' show File, FileSystemEntity;
 
diff --git a/pkg/testing/lib/src/test_root.dart b/pkg/testing/lib/src/test_root.dart
index c23b6ac688e..5773ff07c9a 100644
--- a/pkg/testing/lib/src/test_root.dart
+++ b/pkg/testing/lib/src/test_root.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing.test_root;
+library;
 
 import 'dart:async' show Future;
 
diff --git a/pkg/testing/lib/src/zone_helper.dart b/pkg/testing/lib/src/zone_helper.dart
index b00ad54bcea..040616142c2 100644
--- a/pkg/testing/lib/src/zone_helper.dart
+++ b/pkg/testing/lib/src/zone_helper.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Helper functions for running code in a Zone.
-library testing.zone_helper;
+library;
 
 import 'dart:async'
     show Completer, Future, PrintHandler, ZoneSpecification, runZonedGuarded;
diff --git a/pkg/testing/lib/testing.dart b/pkg/testing/lib/testing.dart
index 3d9f629e4f2..f2f247af678 100644
--- a/pkg/testing/lib/testing.dart
+++ b/pkg/testing/lib/testing.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library testing;
+library;
 
 export 'dart:async' show Future;
 
diff --git a/pkg/testing/pubspec.yaml b/pkg/testing/pubspec.yaml
index f91ce28f6bc..444246d98d1 100644
--- a/pkg/testing/pubspec.yaml
+++ b/pkg/testing/pubspec.yaml
@@ -5,7 +5,7 @@ name: testing
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dev_dependency:
diff --git a/pkg/vm_service/test/test_package/pubspec.yaml b/pkg/vm_service/test/test_package/pubspec.yaml
index 58c11f4bf3d..d1bfffab9eb 100644
--- a/pkg/vm_service/test/test_package/pubspec.yaml
+++ b/pkg/vm_service/test/test_package/pubspec.yaml
@@ -1,4 +1,4 @@
 name: test_package
 publish_to: none
 environment:
-  sdk: '>=2.12.0-0 <4.0.0'
+  sdk: ^3.5.0
\ No newline at end of file
diff --git a/pkg/wasm_builder/pubspec.yaml b/pkg/wasm_builder/pubspec.yaml
index db252e71727..ca699a9731b 100644
--- a/pkg/wasm_builder/pubspec.yaml
+++ b/pkg/wasm_builder/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: none
 description: Generate binary Wasm modules
 
 environment:
-  sdk: ^3.3.0
+  sdk: ^3.5.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/runtime/tools/heapsnapshot/pubspec.yaml b/runtime/tools/heapsnapshot/pubspec.yaml
index 131c17c0388..74c3d9c2827 100644
--- a/runtime/tools/heapsnapshot/pubspec.yaml
+++ b/runtime/tools/heapsnapshot/pubspec.yaml
@@ -7,13 +7,13 @@ repository: https://github.com/dart-lang/sdk/tree/main/pkg/heapsnapshot
 publish_to: none
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '^3.6.0'
 
 dependencies:
   args: ^2.0.0
   heap_snapshot: any
   mmap: any
-  vm_service: ^10.0.0
+  vm_service: ^15.0.0
 
 dev_dependencies:
   dart_console: ^1.1.2
diff --git a/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml b/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml
index 20ab26b906e..ddc301d02f2 100644
--- a/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml
+++ b/sdk/lib/_internal/sdk_library_metadata/pubspec.yaml
@@ -4,4 +4,4 @@ name: sdk_library_metadata
 publish_to: none
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: '^3.5.0'
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index 2814b7b8f9e..00000000000
--- a/tools/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# tools/idl_parser is populated by gclient sync
-idl_parser
-
diff --git a/tools/package_deps/bin/package_deps.dart b/tools/package_deps/bin/package_deps.dart
index f6ebfd3f3d7..c28bde54e17 100644
--- a/tools/package_deps/bin/package_deps.dart
+++ b/tools/package_deps/bin/package_deps.dart
@@ -513,7 +513,7 @@ abstract class PubDep {
 }
 
 class AnyPubDep extends PubDep {
-  AnyPubDep(String name) : super(name);
+  AnyPubDep(super.name);
 
   @override
   String toString() => '$name: any';
@@ -523,7 +523,7 @@ class SdkPubDep extends PubDep {
   final String sdk;
   final String? version;
 
-  SdkPubDep(String name, this.sdk, this.version) : super(name);
+  SdkPubDep(super.name, this.sdk, this.version);
 
   @override
   String toString() => '$name: (sdk: $sdk, version: $version)';
@@ -532,7 +532,7 @@ class SdkPubDep extends PubDep {
 class SemverPubDep extends PubDep {
   final String value;
 
-  SemverPubDep(String name, this.value) : super(name);
+  SemverPubDep(super.name, this.value);
 
   @override
   String toString() => '$name: $value';
@@ -541,14 +541,14 @@ class SemverPubDep extends PubDep {
 class PathPubDep extends PubDep {
   final String path;
 
-  PathPubDep(String name, this.path) : super(name);
+  PathPubDep(super.name, this.path);
 
   @override
   String toString() => '$name: $path';
 }
 
 class UnhandledPubDep extends PubDep {
-  UnhandledPubDep(String name) : super(name);
+  UnhandledPubDep(super.name);
 }
 
 class ResolvedDep {
diff --git a/tools/package_deps/pubspec.yaml b/tools/package_deps/pubspec.yaml
index 8573ac0b4ad..d1e2a1b3c3c 100644
--- a/tools/package_deps/pubspec.yaml
+++ b/tools/package_deps/pubspec.yaml
@@ -5,7 +5,7 @@ description: A tool to validate pubspec files in pkg/.
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '^3.5.0'
 
 dependencies:
   cli_util: any
diff --git a/tools/pubspec.yaml b/tools/pubspec.yaml
new file mode 100644
index 00000000000..d3ac226ef09
--- /dev/null
+++ b/tools/pubspec.yaml
@@ -0,0 +1,21 @@
+name: sdk_tools
+description: Internal tools for building and working on the sdk.
+environment:
+  sdk: ^3.5.0
+
+# This package is not intended for consumption on pub.dev. DO NOT publish.
+publish_to: none
+
+dependencies:
+  args:
+  bisect_dart:
+  cli_util:
+  convert:
+  crypto:
+  glob:
+  http:
+  path:
+  pool:
+  smith:
+  test_runner:
+  yaml:
diff --git a/tools/run_offsets_extractor.dart b/tools/run_offsets_extractor.dart
index 195015fe46f..95886048d03 100755
--- a/tools/run_offsets_extractor.dart
+++ b/tools/run_offsets_extractor.dart
@@ -37,10 +37,10 @@ void main(List<String> args) async {
   });
 
   final (jit, aot) = await (
-    forAllConfigurationsMode((String buildDir, _, _) async {
+    forAllConfigurationsMode((String buildDir, _, __) async {
       return await run(['$buildDir/offsets_extractor']);
     }).then<String>((lines) => lines.join('\n')),
-    forAllConfigurationsMode((String buildDir, _, _) async {
+    forAllConfigurationsMode((String buildDir, _, __) async {
       return await run(['$buildDir/offsets_extractor_aotruntime']);
     }).then<String>((lines) => lines.join('\n')),
   ).wait;