Version 3.4.0-48.0.dev

Merge dd837c8 into dev

DEPS

@@ -140,7 +140,7 @@ vars = {
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "8b1f24a8475a0116757172cd9acca4acbf87d973", # disable rev_sdk_deps.dart
-  "dartdoc_rev": "3ce64a3d7da6702a4342bdfd0723b750fddeb35a", # https://github.com/dart-lang/dartdoc/issues/3562
+  "dartdoc_rev": "b04c9c127fea5f3fdf600aa205f50d81d1c779c5", # https://github.com/dart-lang/dartdoc/issues/3562
   "ecosystem_rev": "1e2785d6900b4d709a31f4c669381dc340cad605",
   "ffi_rev": "c926657618443ff4821411ede01684096b503f84",
   "file_rev": "cd3a9324f6483f313ba1f0f3ff382ea4e6982ef2",
@@ -156,7 +156,7 @@ vars = {
   "leak_tracker_rev": "4a5b077739886f61bd6dc11c78865ef487c917c2",
   "lints_rev": "3810f8b3dc3205cfaa4ccc0054b021e68046d851",
   "logging_rev": "4d35a4e02b9237bd794378413e7ce3deb52ffcaf",
-  "markdown_rev": "7fdfa557dc29e00c94bb637a34869e67d57fdb26",
+  "markdown_rev": "7602f9f17d25702c11991380ebc7853ccdc42f7a",
   "matcher_rev": "d9cf4f69e3f557718ab5be042dd5503afcacac51",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   "mime_rev": "ca9f059d2334bb2657683e0a7f5949817cb4b0e6",
@@ -188,7 +188,7 @@ vars = {
   "usage_rev": "e99690ae6d5fa9ec24ac5218bcd3621e8e3ae8a9",
   "vector_math_rev": "38a00c35575b71a095903467141e5ee60c94d011",
   "watcher_rev": "66cd694ffb7ee6e09ff0cde6c9f788aa47ee1a23",
-  "web_rev": "020ef3729a10a1969b98c2b99b9894c81a953440",
+  "web_rev": "d17fdd2b6ddec289920d02a3df92c3368f0a0e50",
   "web_socket_channel_rev": "5241175e7c66271850d6e75fb9ec90068f9dd3c4", # https://github.com/dart-lang/sdk/issues/54165
   "webdev_rev": "f32fdc48f0ae7cb7fa8088233fd69e2ed30af457",
   "webdriver_rev": "2c1b6f8b9d684caf62d72bb327c24f738a4e7455",

pkg/analyzer_cli/lib/src/driver.dart

@@ -139,6 +139,8 @@ class Driver implements CommandLineStarter {
       _analyzedFileCount += analysisDriver!.knownFiles.length;
     }
 
+    await _analysisContextProvider.dispose();
+
     if (options.perfReport != null) {
       var json = makePerfReport(
           startTime, currentTimeMillis, options, _analyzedFileCount, stats);
@@ -510,6 +512,7 @@ class _AnalysisContextProvider {
   CommandLineOptions? _commandLineOptions;
   late List<String> _pathList;
 
+  final List<AnalysisContextCollectionImpl> _toDispose = [];
   final Map<Folder, DriverBasedAnalysisContext?> _folderContexts = {};
   AnalysisContextCollectionImpl? _collection;
   DriverBasedAnalysisContext? _analysisContext;
@@ -578,11 +581,21 @@ class _AnalysisContextProvider {
       updateAnalysisOptions2: _updateAnalysisOptions,
       fileContentCache: _fileContentCache,
     );
+    _toDispose.add(_collection!);
 
     _setContextForPath(path);
     _folderContexts[folder] = _analysisContext;
   }
 
+  Future<void> dispose() async {
+    _collection = null;
+    var toDispose = _toDispose.toList();
+    _toDispose.clear();
+    for (var collection in toDispose) {
+      await collection.dispose();
+    }
+  }
+
   void setCommandLineOptions(
     CommandLineOptions options,
     List<String> pathList,

pkg/dartdev/test/commands/devtools_test.dart

@@ -111,7 +111,12 @@ void devtools() {
     Process? process;
 
     setUp(() {
-      targetProject = project(
+      // NOTE: we don't use `project()` here since it registers a tear-down
+      // which can be called before the target process is killed. This can be
+      // problematic on Windows, which won't let us delete directories while a
+      // process is actively accessing it. Manually disposing the projects is
+      // the easiest way to work around this.
+      targetProject = TestProject(
         mainSrc: '''
 Future<void> main() async {
   while (true) {
@@ -120,14 +125,16 @@ Future<void> main() async {
 }
 ''',
       );
-      p = project();
+      p = TestProject();
     });
 
     tearDown(() {
       targetProjectInstance?.kill();
       process?.kill();
       targetProjectInstance = null;
       process = null;
+      targetProject.dispose();
+      p.dispose();
     });
 
     Future<String> startTargetProject({

runtime/runtime_args.gni

@@ -59,13 +59,7 @@ declare_args() {
   dart_version_git_info = true
 
   # Controls whether the VM is built as a static library or a shared library.
-  if (is_fuchsia) {
-    # Allow for deduping the VM between standalone, flutter_runner and dart_runner.
-    # TODO(dartbug.com/42473): Use shared_library once elf_loader is untangled.
-    dart_component_kind = "static_library"
-  } else {
-    dart_component_kind = "static_library"
-  }
+  dart_component_kind = "static_library"
 
   # Whether the VM includes the kernel service in all modes (debug, release,
   # product).

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 4
 PATCH 0
-PRERELEASE 47
+PRERELEASE 48
 PRERELEASE_PATCH 0