diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71fd1e0a61..9402cd808b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,12 @@ Important changes to data models, configuration, and migrations between each
 AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
- * Bump runtimeVersion to `2024.11.26`.
- * `dartdoc 8.3.0` is used for packages depending on `package:macros`. 
+ * Bump runtimeVersion to `2024.12.04`.
+ * Upgraded stable Dart analysis SDK to `3.6.0-334.4.beta`
+ * Upgraded stable Flutter analysis SDK to `3.27.0-0.2.pre`.
+ * Upgraded dartdoc to `8.3.0`.
+ * Upgraded pana to `0.22.16`.
+ * Upgraded dependencies.
 
 ## `20241121t150900-all`
  * Bump runtimeVersion to `2024.11.21`.
diff --git a/Dockerfile.worker b/Dockerfile.worker
index 471f734b89..41572102a9 100644
--- a/Dockerfile.worker
+++ b/Dockerfile.worker
@@ -23,10 +23,10 @@ RUN mkdir -p /home/worker/config/dart-stable
 RUN mkdir -p /home/worker/config/flutter-stable
 
 # Setup Dart SDK into /home/worker/dart/{stable,preview}/
-RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.5.4
+RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.6.0-334.4.beta beta
 
 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/
-RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.24.5
+RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.27.0-0.2.pre beta
 
 # Setup webp
 RUN tool/setup-webp.sh /home/worker/bin
diff --git a/app/lib/admin/models.g.dart b/app/lib/admin/models.g.dart
index 71b822535e..06cba922c1 100644
--- a/app/lib/admin/models.g.dart
+++ b/app/lib/admin/models.g.dart
@@ -31,22 +31,13 @@ ModerationActionLogEntry _$ModerationActionLogEntryFromJson(
     );
 
 Map<String, dynamic> _$ModerationActionLogEntryToJson(
-    ModerationActionLogEntry instance) {
-  final val = <String, dynamic>{
-    'timestamp': instance.timestamp.toIso8601String(),
-    'subject': instance.subject,
-    'moderationAction': _$ModerationActionEnumMap[instance.moderationAction]!,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('note', instance.note);
-  return val;
-}
+        ModerationActionLogEntry instance) =>
+    <String, dynamic>{
+      'timestamp': instance.timestamp.toIso8601String(),
+      'subject': instance.subject,
+      'moderationAction': _$ModerationActionEnumMap[instance.moderationAction]!,
+      if (instance.note case final value?) 'note': value,
+    };
 
 const _$ModerationActionEnumMap = {
   ModerationAction.apply: 'apply',
diff --git a/app/lib/dartdoc/models.g.dart b/app/lib/dartdoc/models.g.dart
index ee345a2803..9846eff808 100644
--- a/app/lib/dartdoc/models.g.dart
+++ b/app/lib/dartdoc/models.g.dart
@@ -15,21 +15,12 @@ ResolvedDocUrlVersion _$ResolvedDocUrlVersionFromJson(
     );
 
 Map<String, dynamic> _$ResolvedDocUrlVersionToJson(
-    ResolvedDocUrlVersion instance) {
-  final val = <String, dynamic>{
-    'version': instance.version,
-    'urlSegment': instance.urlSegment,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('message', instance.message);
-  return val;
-}
+        ResolvedDocUrlVersion instance) =>
+    <String, dynamic>{
+      'version': instance.version,
+      'urlSegment': instance.urlSegment,
+      if (instance.message case final value?) 'message': value,
+    };
 
 DocPageStatus _$DocPageStatusFromJson(Map<String, dynamic> json) =>
     DocPageStatus(
@@ -38,21 +29,12 @@ DocPageStatus _$DocPageStatusFromJson(Map<String, dynamic> json) =>
       errorMessage: json['errorMessage'] as String?,
     );
 
-Map<String, dynamic> _$DocPageStatusToJson(DocPageStatus instance) {
-  final val = <String, dynamic>{
-    'code': _$DocPageStatusCodeEnumMap[instance.code]!,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('redirectPath', instance.redirectPath);
-  writeNotNull('errorMessage', instance.errorMessage);
-  return val;
-}
+Map<String, dynamic> _$DocPageStatusToJson(DocPageStatus instance) =>
+    <String, dynamic>{
+      'code': _$DocPageStatusCodeEnumMap[instance.code]!,
+      if (instance.redirectPath case final value?) 'redirectPath': value,
+      if (instance.errorMessage case final value?) 'errorMessage': value,
+    };
 
 const _$DocPageStatusCodeEnumMap = {
   DocPageStatusCode.ok: 'ok',
diff --git a/app/lib/package/models.g.dart b/app/lib/package/models.g.dart
index 8b0f3664dd..0bb00d6098 100644
--- a/app/lib/package/models.g.dart
+++ b/app/lib/package/models.g.dart
@@ -53,21 +53,15 @@ AutomatedPublishing _$AutomatedPublishingFromJson(Map<String, dynamic> json) =>
           : GcpPublishingLock.fromJson(json['gcpLock'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$AutomatedPublishingToJson(AutomatedPublishing instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('githubConfig', instance.githubConfig?.toJson());
-  writeNotNull('githubLock', instance.githubLock?.toJson());
-  writeNotNull('gcpConfig', instance.gcpConfig?.toJson());
-  writeNotNull('gcpLock', instance.gcpLock?.toJson());
-  return val;
-}
+Map<String, dynamic> _$AutomatedPublishingToJson(
+        AutomatedPublishing instance) =>
+    <String, dynamic>{
+      if (instance.githubConfig?.toJson() case final value?)
+        'githubConfig': value,
+      if (instance.githubLock?.toJson() case final value?) 'githubLock': value,
+      if (instance.gcpConfig?.toJson() case final value?) 'gcpConfig': value,
+      if (instance.gcpLock?.toJson() case final value?) 'gcpLock': value,
+    };
 
 GitHubPublishingLock _$GitHubPublishingLockFromJson(
         Map<String, dynamic> json) =>
@@ -122,32 +116,26 @@ PackageView _$PackageViewFromJson(Map<String, dynamic> json) => PackageView(
           (json['thirtyDaysDownloadCounts'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$PackageViewToJson(PackageView instance) {
-  final val = <String, dynamic>{
-    'name': instance.name,
-    'releases': instance.releases,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('ellipsizedDescription', instance.ellipsizedDescription);
-  val['created'] = instance.created.toIso8601String();
-  writeNotNull('publisherId', instance.publisherId);
-  val['isPending'] = instance.isPending;
-  val['likes'] = instance.likes;
-  writeNotNull('grantedPubPoints', instance.grantedPubPoints);
-  writeNotNull('maxPubPoints', instance.maxPubPoints);
-  val['tags'] = instance.tags;
-  writeNotNull('replacedBy', instance.replacedBy);
-  writeNotNull('spdxIdentifiers', instance.spdxIdentifiers);
-  writeNotNull('apiPages', instance.apiPages);
-  writeNotNull('screenshots', instance.screenshots);
-  writeNotNull('topics', instance.topics);
-  val['popularity'] = instance.popularity;
-  writeNotNull('thirtyDaysDownloadCounts', instance.thirtyDaysDownloadCounts);
-  return val;
-}
+Map<String, dynamic> _$PackageViewToJson(PackageView instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      'releases': instance.releases,
+      if (instance.ellipsizedDescription case final value?)
+        'ellipsizedDescription': value,
+      'created': instance.created.toIso8601String(),
+      if (instance.publisherId case final value?) 'publisherId': value,
+      'isPending': instance.isPending,
+      'likes': instance.likes,
+      if (instance.grantedPubPoints case final value?)
+        'grantedPubPoints': value,
+      if (instance.maxPubPoints case final value?) 'maxPubPoints': value,
+      'tags': instance.tags,
+      if (instance.replacedBy case final value?) 'replacedBy': value,
+      if (instance.spdxIdentifiers case final value?) 'spdxIdentifiers': value,
+      if (instance.apiPages case final value?) 'apiPages': value,
+      if (instance.screenshots case final value?) 'screenshots': value,
+      if (instance.topics case final value?) 'topics': value,
+      'popularity': instance.popularity,
+      if (instance.thirtyDaysDownloadCounts case final value?)
+        'thirtyDaysDownloadCounts': value,
+    };
diff --git a/app/lib/scorecard/models.g.dart b/app/lib/scorecard/models.g.dart
index 1235e7470b..2ccefa0706 100644
--- a/app/lib/scorecard/models.g.dart
+++ b/app/lib/scorecard/models.g.dart
@@ -75,27 +75,20 @@ PanaReport _$PanaReportFromJson(Map<String, dynamic> json) => PanaReport(
           .toList(),
     );
 
-Map<String, dynamic> _$PanaReportToJson(PanaReport instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('timestamp', instance.timestamp?.toIso8601String());
-  writeNotNull('panaRuntimeInfo', instance.panaRuntimeInfo);
-  writeNotNull('reportStatus', instance.reportStatus);
-  writeNotNull('derivedTags', instance.derivedTags);
-  writeNotNull('allDependencies', instance.allDependencies);
-  writeNotNull('licenses', instance.licenses);
-  writeNotNull('report', instance.report);
-  writeNotNull('result', instance.result);
-  writeNotNull('screenshots', instance.screenshots);
-  writeNotNull('urlProblems', instance.urlProblems);
-  return val;
-}
+Map<String, dynamic> _$PanaReportToJson(PanaReport instance) =>
+    <String, dynamic>{
+      if (instance.timestamp?.toIso8601String() case final value?)
+        'timestamp': value,
+      if (instance.panaRuntimeInfo case final value?) 'panaRuntimeInfo': value,
+      if (instance.reportStatus case final value?) 'reportStatus': value,
+      if (instance.derivedTags case final value?) 'derivedTags': value,
+      if (instance.allDependencies case final value?) 'allDependencies': value,
+      if (instance.licenses case final value?) 'licenses': value,
+      if (instance.report case final value?) 'report': value,
+      if (instance.result case final value?) 'result': value,
+      if (instance.screenshots case final value?) 'screenshots': value,
+      if (instance.urlProblems case final value?) 'urlProblems': value,
+    };
 
 DartdocReport _$DartdocReportFromJson(Map<String, dynamic> json) =>
     DartdocReport(
diff --git a/app/lib/search/search_service.g.dart b/app/lib/search/search_service.g.dart
index f8d9a9ed09..f0c2bcc70b 100644
--- a/app/lib/search/search_service.g.dart
+++ b/app/lib/search/search_service.g.dart
@@ -97,27 +97,18 @@ PackageSearchResult _$PackageSearchResultFromJson(Map<String, dynamic> json) =>
       statusCode: (json['statusCode'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$PackageSearchResultToJson(PackageSearchResult instance) {
-  final val = <String, dynamic>{
-    'timestamp': instance.timestamp.toIso8601String(),
-    'totalCount': instance.totalCount,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('nameMatches', instance.nameMatches);
-  writeNotNull('topicMatches', instance.topicMatches);
-  val['sdkLibraryHits'] =
-      instance.sdkLibraryHits.map((e) => e.toJson()).toList();
-  val['packageHits'] = instance.packageHits.map((e) => e.toJson()).toList();
-  writeNotNull('errorMessage', instance.errorMessage);
-  writeNotNull('statusCode', instance.statusCode);
-  return val;
-}
+Map<String, dynamic> _$PackageSearchResultToJson(
+        PackageSearchResult instance) =>
+    <String, dynamic>{
+      'timestamp': instance.timestamp.toIso8601String(),
+      'totalCount': instance.totalCount,
+      if (instance.nameMatches case final value?) 'nameMatches': value,
+      if (instance.topicMatches case final value?) 'topicMatches': value,
+      'sdkLibraryHits': instance.sdkLibraryHits.map((e) => e.toJson()).toList(),
+      'packageHits': instance.packageHits.map((e) => e.toJson()).toList(),
+      if (instance.errorMessage case final value?) 'errorMessage': value,
+      if (instance.statusCode case final value?) 'statusCode': value,
+    };
 
 SdkLibraryHit _$SdkLibraryHitFromJson(Map<String, dynamic> json) =>
     SdkLibraryHit(
@@ -132,24 +123,17 @@ SdkLibraryHit _$SdkLibraryHitFromJson(Map<String, dynamic> json) =>
           .toList(),
     );
 
-Map<String, dynamic> _$SdkLibraryHitToJson(SdkLibraryHit instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('sdk', instance.sdk);
-  writeNotNull('version', instance.version);
-  writeNotNull('library', instance.library);
-  writeNotNull('description', instance.description);
-  writeNotNull('url', instance.url);
-  val['score'] = instance.score;
-  writeNotNull('apiPages', instance.apiPages?.map((e) => e.toJson()).toList());
-  return val;
-}
+Map<String, dynamic> _$SdkLibraryHitToJson(SdkLibraryHit instance) =>
+    <String, dynamic>{
+      if (instance.sdk case final value?) 'sdk': value,
+      if (instance.version case final value?) 'version': value,
+      if (instance.library case final value?) 'library': value,
+      if (instance.description case final value?) 'description': value,
+      if (instance.url case final value?) 'url': value,
+      'score': instance.score,
+      if (instance.apiPages?.map((e) => e.toJson()).toList() case final value?)
+        'apiPages': value,
+    };
 
 PackageHit _$PackageHitFromJson(Map<String, dynamic> json) => PackageHit(
       package: json['package'] as String,
@@ -159,21 +143,13 @@ PackageHit _$PackageHitFromJson(Map<String, dynamic> json) => PackageHit(
           .toList(),
     );
 
-Map<String, dynamic> _$PackageHitToJson(PackageHit instance) {
-  final val = <String, dynamic>{
-    'package': instance.package,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('score', instance.score);
-  writeNotNull('apiPages', instance.apiPages?.map((e) => e.toJson()).toList());
-  return val;
-}
+Map<String, dynamic> _$PackageHitToJson(PackageHit instance) =>
+    <String, dynamic>{
+      'package': instance.package,
+      if (instance.score case final value?) 'score': value,
+      if (instance.apiPages?.map((e) => e.toJson()).toList() case final value?)
+        'apiPages': value,
+    };
 
 ApiPageRef _$ApiPageRefFromJson(Map<String, dynamic> json) => ApiPageRef(
       title: json['title'] as String?,
@@ -181,17 +157,9 @@ ApiPageRef _$ApiPageRefFromJson(Map<String, dynamic> json) => ApiPageRef(
       url: json['url'] as String?,
     );
 
-Map<String, dynamic> _$ApiPageRefToJson(ApiPageRef instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('title', instance.title);
-  writeNotNull('path', instance.path);
-  writeNotNull('url', instance.url);
-  return val;
-}
+Map<String, dynamic> _$ApiPageRefToJson(ApiPageRef instance) =>
+    <String, dynamic>{
+      if (instance.title case final value?) 'title': value,
+      if (instance.path case final value?) 'path': value,
+      if (instance.url case final value?) 'url': value,
+    };
diff --git a/app/lib/service/download_counts/download_counts.g.dart b/app/lib/service/download_counts/download_counts.g.dart
index 55275441b4..0872916207 100644
--- a/app/lib/service/download_counts/download_counts.g.dart
+++ b/app/lib/service/download_counts/download_counts.g.dart
@@ -47,37 +47,29 @@ CountData _$CountDataFromJson(Map<String, dynamic> json) => CountData(
         ? null
         : DateTime.parse(json['newestDate'] as String);
 
-Map<String, dynamic> _$CountDataToJson(CountData instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('newestDate', instance.newestDate?.toIso8601String());
-  val['majorRangeCounts'] = instance.majorRangeCounts
-      .map((e) => <String, dynamic>{
-            'counts': e.counts,
-            'versionRange': e.versionRange,
-          })
-      .toList();
-  val['minorRangeCounts'] = instance.minorRangeCounts
-      .map((e) => <String, dynamic>{
-            'counts': e.counts,
-            'versionRange': e.versionRange,
-          })
-      .toList();
-  val['patchRangeCounts'] = instance.patchRangeCounts
-      .map((e) => <String, dynamic>{
-            'counts': e.counts,
-            'versionRange': e.versionRange,
-          })
-      .toList();
-  val['totalCounts'] = instance.totalCounts;
-  return val;
-}
+Map<String, dynamic> _$CountDataToJson(CountData instance) => <String, dynamic>{
+      if (instance.newestDate?.toIso8601String() case final value?)
+        'newestDate': value,
+      'majorRangeCounts': instance.majorRangeCounts
+          .map((e) => <String, dynamic>{
+                'counts': e.counts,
+                'versionRange': e.versionRange,
+              })
+          .toList(),
+      'minorRangeCounts': instance.minorRangeCounts
+          .map((e) => <String, dynamic>{
+                'counts': e.counts,
+                'versionRange': e.versionRange,
+              })
+          .toList(),
+      'patchRangeCounts': instance.patchRangeCounts
+          .map((e) => <String, dynamic>{
+                'counts': e.counts,
+                'versionRange': e.versionRange,
+              })
+          .toList(),
+      'totalCounts': instance.totalCounts,
+    };
 
 $Rec _$recordConvert<$Rec>(
   Object? value,
diff --git a/app/lib/service/openid/openid_models.g.dart b/app/lib/service/openid/openid_models.g.dart
index 7a06ee1c9d..9b32d39a29 100644
--- a/app/lib/service/openid/openid_models.g.dart
+++ b/app/lib/service/openid/openid_models.g.dart
@@ -65,25 +65,18 @@ JsonWebKey _$JsonWebKeyFromJson(Map<String, dynamic> json) => JsonWebKey(
           .fromJson(json['e'] as String?),
     );
 
-Map<String, dynamic> _$JsonWebKeyToJson(JsonWebKey instance) {
-  final val = <String, dynamic>{
-    'alg': instance.alg,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('use', instance.use);
-  writeNotNull('kid', instance.kid);
-  writeNotNull('kty', instance.kty);
-  writeNotNull('x5c', instance.x5c);
-  writeNotNull('x5t', instance.x5t);
-  writeNotNull('n',
-      const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.n));
-  writeNotNull('e',
-      const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.e));
-  return val;
-}
+Map<String, dynamic> _$JsonWebKeyToJson(JsonWebKey instance) =>
+    <String, dynamic>{
+      'alg': instance.alg,
+      if (instance.use case final value?) 'use': value,
+      if (instance.kid case final value?) 'kid': value,
+      if (instance.kty case final value?) 'kty': value,
+      if (instance.x5c case final value?) 'x5c': value,
+      if (instance.x5t case final value?) 'x5t': value,
+      if (const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.n)
+          case final value?)
+        'n': value,
+      if (const NullableUint8ListUnpaddedBase64UrlConverter().toJson(instance.e)
+          case final value?)
+        'e': value,
+    };
diff --git a/app/lib/shared/configuration.g.dart b/app/lib/shared/configuration.g.dart
index 86144f90f9..c22cb14b36 100644
--- a/app/lib/shared/configuration.g.dart
+++ b/app/lib/shared/configuration.g.dart
@@ -265,23 +265,13 @@ RateLimit _$RateLimitFromJson(Map<String, dynamic> json) => $checkedCreate(
       },
     );
 
-Map<String, dynamic> _$RateLimitToJson(RateLimit instance) {
-  final val = <String, dynamic>{
-    'operation': instance.operation,
-    'scope': _$RateLimitScopeEnumMap[instance.scope]!,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('burst', instance.burst);
-  writeNotNull('hourly', instance.hourly);
-  writeNotNull('daily', instance.daily);
-  return val;
-}
+Map<String, dynamic> _$RateLimitToJson(RateLimit instance) => <String, dynamic>{
+      'operation': instance.operation,
+      'scope': _$RateLimitScopeEnumMap[instance.scope]!,
+      if (instance.burst case final value?) 'burst': value,
+      if (instance.hourly case final value?) 'hourly': value,
+      if (instance.daily case final value?) 'daily': value,
+    };
 
 const _$RateLimitScopeEnumMap = {
   RateLimitScope.package: 'package',
diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart
index 1313227ec7..c589991d9a 100644
--- a/app/lib/shared/versions.dart
+++ b/app/lib/shared/versions.dart
@@ -24,7 +24,7 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
 /// when the version switch happens.
 const _acceptedRuntimeVersions = <String>[
   // The current [runtimeVersion].
-  '2024.11.26',
+  '2024.12.04',
   // Fallback runtime versions.
   '2024.11.21',
   '2024.11.18',
@@ -62,8 +62,8 @@ bool shouldGCVersion(String version) =>
 
 // keep in-sync with SDK version in .mono_repo.yml and Dockerfile
 final String runtimeSdkVersion = '3.5.0';
-final String toolStableDartSdkVersion = '3.5.4';
-final String toolStableFlutterSdkVersion = '3.24.5';
+final String toolStableDartSdkVersion = '3.6.0-334.4.beta';
+final String toolStableFlutterSdkVersion = '3.27.0-0.2.pre';
 
 final semanticToolStableDartSdkVersion =
     Version.parse(toolStableDartSdkVersion);
@@ -74,4 +74,4 @@ final semanticToolStableFlutterSdkVersion =
 final String panaVersion = pana.packageVersion;
 
 // keep in-sync with pkg/pub-worker/lib/src/bin/pana_wrapper.dart
-final String dartdocVersion = '8.1.0';
+final String dartdocVersion = '8.3.0';
diff --git a/app/lib/tool/test_profile/models.g.dart b/app/lib/tool/test_profile/models.g.dart
index ac691b5de1..05173429b3 100644
--- a/app/lib/tool/test_profile/models.g.dart
+++ b/app/lib/tool/test_profile/models.g.dart
@@ -19,22 +19,13 @@ TestProfile _$TestProfileFromJson(Map<String, dynamic> json) => TestProfile(
       defaultUser: json['defaultUser'] as String?,
     );
 
-Map<String, dynamic> _$TestProfileToJson(TestProfile instance) {
-  final val = <String, dynamic>{
-    'packages': instance.packages.map((e) => e.toJson()).toList(),
-    'publishers': instance.publishers.map((e) => e.toJson()).toList(),
-    'users': instance.users.map((e) => e.toJson()).toList(),
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('defaultUser', instance.defaultUser);
-  return val;
-}
+Map<String, dynamic> _$TestProfileToJson(TestProfile instance) =>
+    <String, dynamic>{
+      'packages': instance.packages.map((e) => e.toJson()).toList(),
+      'publishers': instance.publishers.map((e) => e.toJson()).toList(),
+      'users': instance.users.map((e) => e.toJson()).toList(),
+      if (instance.defaultUser case final value?) 'defaultUser': value,
+    };
 
 TestPackage _$TestPackageFromJson(Map<String, dynamic> json) => TestPackage(
       name: json['name'] as String,
@@ -55,28 +46,22 @@ TestPackage _$TestPackageFromJson(Map<String, dynamic> json) => TestPackage(
       likeCount: (json['likeCount'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$TestPackageToJson(TestPackage instance) {
-  final val = <String, dynamic>{
-    'name': instance.name,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('uploaders', instance.uploaders);
-  writeNotNull('publisher', instance.publisher);
-  writeNotNull('versions', instance.versions?.map((e) => e.toJson()).toList());
-  writeNotNull('isDiscontinued', instance.isDiscontinued);
-  writeNotNull('replacedBy', instance.replacedBy);
-  writeNotNull('isUnlisted', instance.isUnlisted);
-  writeNotNull('isFlutterFavorite', instance.isFlutterFavorite);
-  writeNotNull('retractedVersions', instance.retractedVersions);
-  writeNotNull('likeCount', instance.likeCount);
-  return val;
-}
+Map<String, dynamic> _$TestPackageToJson(TestPackage instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      if (instance.uploaders case final value?) 'uploaders': value,
+      if (instance.publisher case final value?) 'publisher': value,
+      if (instance.versions?.map((e) => e.toJson()).toList() case final value?)
+        'versions': value,
+      if (instance.isDiscontinued case final value?) 'isDiscontinued': value,
+      if (instance.replacedBy case final value?) 'replacedBy': value,
+      if (instance.isUnlisted case final value?) 'isUnlisted': value,
+      if (instance.isFlutterFavorite case final value?)
+        'isFlutterFavorite': value,
+      if (instance.retractedVersions case final value?)
+        'retractedVersions': value,
+      if (instance.likeCount case final value?) 'likeCount': value,
+    };
 
 TestVersion _$TestVersionFromJson(Map<String, dynamic> json) => TestVersion(
       version: json['version'] as String,
@@ -85,20 +70,12 @@ TestVersion _$TestVersionFromJson(Map<String, dynamic> json) => TestVersion(
           : DateTime.parse(json['created'] as String),
     );
 
-Map<String, dynamic> _$TestVersionToJson(TestVersion instance) {
-  final val = <String, dynamic>{
-    'version': instance.version,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('created', instance.created?.toIso8601String());
-  return val;
-}
+Map<String, dynamic> _$TestVersionToJson(TestVersion instance) =>
+    <String, dynamic>{
+      'version': instance.version,
+      if (instance.created?.toIso8601String() case final value?)
+        'created': value,
+    };
 
 TestPublisher _$TestPublisherFromJson(Map<String, dynamic> json) =>
     TestPublisher(
@@ -145,18 +122,10 @@ ResolvedVersion _$ResolvedVersionFromJson(Map<String, dynamic> json) =>
           : DateTime.parse(json['created'] as String),
     );
 
-Map<String, dynamic> _$ResolvedVersionToJson(ResolvedVersion instance) {
-  final val = <String, dynamic>{
-    'package': instance.package,
-    'version': instance.version,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('created', instance.created?.toIso8601String());
-  return val;
-}
+Map<String, dynamic> _$ResolvedVersionToJson(ResolvedVersion instance) =>
+    <String, dynamic>{
+      'package': instance.package,
+      'version': instance.version,
+      if (instance.created?.toIso8601String() case final value?)
+        'created': value,
+    };
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 19258f2042..a569808d7f 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -47,7 +47,7 @@ dependencies:
   watcher: ^1.0.0
   yaml: ^3.1.0
   # pana version to be pinned
-  pana: '0.22.15'
+  pana: '0.22.16'
   # 3rd-party packages with pinned versions
   mailer: '6.2.0'
   ulid: '2.0.1'
diff --git a/app/test/dartdoc/dartdoc_page_test.dart b/app/test/dartdoc/dartdoc_page_test.dart
index c1fb9bbfb4..a056a459e8 100644
--- a/app/test/dartdoc/dartdoc_page_test.dart
+++ b/app/test/dartdoc/dartdoc_page_test.dart
@@ -67,7 +67,9 @@ void main() {
       }
       await Directory(pubCacheDir).create(recursive: true);
       toolEnv = await ToolEnvironment.create(
-        dartdocVersion: dartdocVersion,
+        dartdocVersion:
+            // TODO: clean up after 3.6 SDK is released
+            Platform.version.startsWith('3.5.') ? '8.1.0' : dartdocVersion,
         pubCacheDir: pubCacheDir,
       );
       await toolEnv.runUpgrade(pkgDir, false);
diff --git a/pkg/_pub_shared/lib/data/advisories_api.g.dart b/pkg/_pub_shared/lib/data/advisories_api.g.dart
index 05fe04867f..472cf80c7f 100644
--- a/pkg/_pub_shared/lib/data/advisories_api.g.dart
+++ b/pkg/_pub_shared/lib/data/advisories_api.g.dart
@@ -53,31 +53,23 @@ OSV _$OSVFromJson(Map<String, dynamic> json) => OSV(
       databaseSpecific: json['database_specific'] as Map<String, dynamic>?,
     );
 
-Map<String, dynamic> _$OSVToJson(OSV instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('schema_version', instance.schemaVersion);
-  val['id'] = instance.id;
-  val['modified'] = instance.modified;
-  writeNotNull('published', instance.published);
-  writeNotNull('withdrawn', instance.withdrawn);
-  val['aliases'] = instance.aliases;
-  writeNotNull('related', instance.related);
-  writeNotNull('summary', instance.summary);
-  writeNotNull('details', instance.details);
-  writeNotNull('severity', instance.severity);
-  writeNotNull('affected', instance.affected);
-  writeNotNull('references', instance.references);
-  writeNotNull('credits', instance.credits);
-  writeNotNull('database_specific', instance.databaseSpecific);
-  return val;
-}
+Map<String, dynamic> _$OSVToJson(OSV instance) => <String, dynamic>{
+      if (instance.schemaVersion case final value?) 'schema_version': value,
+      'id': instance.id,
+      'modified': instance.modified,
+      if (instance.published case final value?) 'published': value,
+      if (instance.withdrawn case final value?) 'withdrawn': value,
+      'aliases': instance.aliases,
+      if (instance.related case final value?) 'related': value,
+      if (instance.summary case final value?) 'summary': value,
+      if (instance.details case final value?) 'details': value,
+      if (instance.severity case final value?) 'severity': value,
+      if (instance.affected case final value?) 'affected': value,
+      if (instance.references case final value?) 'references': value,
+      if (instance.credits case final value?) 'credits': value,
+      if (instance.databaseSpecific case final value?)
+        'database_specific': value,
+    };
 
 Severity _$SeverityFromJson(Map<String, dynamic> json) => Severity(
       type: json['type'] as String,
diff --git a/pkg/_pub_shared/lib/data/package_api.g.dart b/pkg/_pub_shared/lib/data/package_api.g.dart
index 63f29dec69..403ea038f4 100644
--- a/pkg/_pub_shared/lib/data/package_api.g.dart
+++ b/pkg/_pub_shared/lib/data/package_api.g.dart
@@ -45,19 +45,11 @@ AutomatedPublishingConfig _$AutomatedPublishingConfigFromJson(
     );
 
 Map<String, dynamic> _$AutomatedPublishingConfigToJson(
-    AutomatedPublishingConfig instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('github', instance.github?.toJson());
-  writeNotNull('gcp', instance.gcp?.toJson());
-  return val;
-}
+        AutomatedPublishingConfig instance) =>
+    <String, dynamic>{
+      if (instance.github?.toJson() case final value?) 'github': value,
+      if (instance.gcp?.toJson() case final value?) 'gcp': value,
+    };
 
 GitHubPublishingConfig _$GitHubPublishingConfigFromJson(
         Map<String, dynamic> json) =>
@@ -73,26 +65,16 @@ GitHubPublishingConfig _$GitHubPublishingConfigFromJson(
     );
 
 Map<String, dynamic> _$GitHubPublishingConfigToJson(
-    GitHubPublishingConfig instance) {
-  final val = <String, dynamic>{
-    'isEnabled': instance.isEnabled,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('repository', instance.repository);
-  writeNotNull('tagPattern', instance.tagPattern);
-  val['requireEnvironment'] = instance.requireEnvironment;
-  writeNotNull('environment', instance.environment);
-  val['isPushEventEnabled'] = instance.isPushEventEnabled;
-  val['isWorkflowDispatchEventEnabled'] =
-      instance.isWorkflowDispatchEventEnabled;
-  return val;
-}
+        GitHubPublishingConfig instance) =>
+    <String, dynamic>{
+      'isEnabled': instance.isEnabled,
+      if (instance.repository case final value?) 'repository': value,
+      if (instance.tagPattern case final value?) 'tagPattern': value,
+      'requireEnvironment': instance.requireEnvironment,
+      if (instance.environment case final value?) 'environment': value,
+      'isPushEventEnabled': instance.isPushEventEnabled,
+      'isWorkflowDispatchEventEnabled': instance.isWorkflowDispatchEventEnabled,
+    };
 
 GcpPublishingConfig _$GcpPublishingConfigFromJson(Map<String, dynamic> json) =>
     GcpPublishingConfig(
@@ -100,20 +82,13 @@ GcpPublishingConfig _$GcpPublishingConfigFromJson(Map<String, dynamic> json) =>
       serviceAccountEmail: json['serviceAccountEmail'] as String?,
     );
 
-Map<String, dynamic> _$GcpPublishingConfigToJson(GcpPublishingConfig instance) {
-  final val = <String, dynamic>{
-    'isEnabled': instance.isEnabled,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('serviceAccountEmail', instance.serviceAccountEmail);
-  return val;
-}
+Map<String, dynamic> _$GcpPublishingConfigToJson(
+        GcpPublishingConfig instance) =>
+    <String, dynamic>{
+      'isEnabled': instance.isEnabled,
+      if (instance.serviceAccountEmail case final value?)
+        'serviceAccountEmail': value,
+    };
 
 VersionOptions _$VersionOptionsFromJson(Map<String, dynamic> json) =>
     VersionOptions(
@@ -168,25 +143,16 @@ PackageData _$PackageDataFromJson(Map<String, dynamic> json) => PackageData(
           : DateTime.parse(json['advisoriesUpdated'] as String),
     );
 
-Map<String, dynamic> _$PackageDataToJson(PackageData instance) {
-  final val = <String, dynamic>{
-    'name': instance.name,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('isDiscontinued', instance.isDiscontinued);
-  writeNotNull('replacedBy', instance.replacedBy);
-  val['latest'] = instance.latest;
-  val['versions'] = instance.versions;
-  writeNotNull(
-      'advisoriesUpdated', instance.advisoriesUpdated?.toIso8601String());
-  return val;
-}
+Map<String, dynamic> _$PackageDataToJson(PackageData instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      if (instance.isDiscontinued case final value?) 'isDiscontinued': value,
+      if (instance.replacedBy case final value?) 'replacedBy': value,
+      'latest': instance.latest,
+      'versions': instance.versions,
+      if (instance.advisoriesUpdated?.toIso8601String() case final value?)
+        'advisoriesUpdated': value,
+    };
 
 VersionInfo _$VersionInfoFromJson(Map<String, dynamic> json) => VersionInfo(
       version: json['version'] as String,
@@ -199,24 +165,16 @@ VersionInfo _$VersionInfoFromJson(Map<String, dynamic> json) => VersionInfo(
           : DateTime.parse(json['published'] as String),
     );
 
-Map<String, dynamic> _$VersionInfoToJson(VersionInfo instance) {
-  final val = <String, dynamic>{
-    'version': instance.version,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('retracted', instance.retracted);
-  val['pubspec'] = instance.pubspec;
-  writeNotNull('archive_url', instance.archiveUrl);
-  writeNotNull('archive_sha256', instance.archiveSha256);
-  writeNotNull('published', instance.published?.toIso8601String());
-  return val;
-}
+Map<String, dynamic> _$VersionInfoToJson(VersionInfo instance) =>
+    <String, dynamic>{
+      'version': instance.version,
+      if (instance.retracted case final value?) 'retracted': value,
+      'pubspec': instance.pubspec,
+      if (instance.archiveUrl case final value?) 'archive_url': value,
+      if (instance.archiveSha256 case final value?) 'archive_sha256': value,
+      if (instance.published?.toIso8601String() case final value?)
+        'published': value,
+    };
 
 VersionScore _$VersionScoreFromJson(Map<String, dynamic> json) => VersionScore(
       grantedPoints: (json['grantedPoints'] as num?)?.toInt(),
@@ -229,23 +187,16 @@ VersionScore _$VersionScoreFromJson(Map<String, dynamic> json) => VersionScore(
           : DateTime.parse(json['lastUpdated'] as String),
     );
 
-Map<String, dynamic> _$VersionScoreToJson(VersionScore instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('grantedPoints', instance.grantedPoints);
-  writeNotNull('maxPoints', instance.maxPoints);
-  writeNotNull('likeCount', instance.likeCount);
-  writeNotNull('popularityScore', instance.popularityScore);
-  writeNotNull('tags', instance.tags);
-  writeNotNull('lastUpdated', instance.lastUpdated?.toIso8601String());
-  return val;
-}
+Map<String, dynamic> _$VersionScoreToJson(VersionScore instance) =>
+    <String, dynamic>{
+      if (instance.grantedPoints case final value?) 'grantedPoints': value,
+      if (instance.maxPoints case final value?) 'maxPoints': value,
+      if (instance.likeCount case final value?) 'likeCount': value,
+      if (instance.popularityScore case final value?) 'popularityScore': value,
+      if (instance.tags case final value?) 'tags': value,
+      if (instance.lastUpdated?.toIso8601String() case final value?)
+        'lastUpdated': value,
+    };
 
 RemoveUploaderRequest _$RemoveUploaderRequestFromJson(
         Map<String, dynamic> json) =>
diff --git a/pkg/_pub_shared/lib/data/page_data.g.dart b/pkg/_pub_shared/lib/data/page_data.g.dart
index caf04994a6..fae523bc3b 100644
--- a/pkg/_pub_shared/lib/data/page_data.g.dart
+++ b/pkg/_pub_shared/lib/data/page_data.g.dart
@@ -17,21 +17,12 @@ PageData _$PageDataFromJson(Map<String, dynamic> json) => PageData(
       sessionAware: json['sessionAware'] as bool?,
     );
 
-Map<String, dynamic> _$PageDataToJson(PageData instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('consentId', instance.consentId);
-  writeNotNull('pkgData', instance.pkgData);
-  writeNotNull('publisher', instance.publisher);
-  writeNotNull('sessionAware', instance.sessionAware);
-  return val;
-}
+Map<String, dynamic> _$PageDataToJson(PageData instance) => <String, dynamic>{
+      if (instance.consentId case final value?) 'consentId': value,
+      if (instance.pkgData case final value?) 'pkgData': value,
+      if (instance.publisher case final value?) 'publisher': value,
+      if (instance.sessionAware case final value?) 'sessionAware': value,
+    };
 
 PkgData _$PkgDataFromJson(Map<String, dynamic> json) => PkgData(
       package: json['package'] as String,
@@ -42,24 +33,14 @@ PkgData _$PkgDataFromJson(Map<String, dynamic> json) => PkgData(
       isLatest: json['isLatest'] as bool,
     );
 
-Map<String, dynamic> _$PkgDataToJson(PkgData instance) {
-  final val = <String, dynamic>{
-    'package': instance.package,
-    'version': instance.version,
-    'likes': instance.likes,
-  };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('publisherId', instance.publisherId);
-  val['isDiscontinued'] = instance.isDiscontinued;
-  val['isLatest'] = instance.isLatest;
-  return val;
-}
+Map<String, dynamic> _$PkgDataToJson(PkgData instance) => <String, dynamic>{
+      'package': instance.package,
+      'version': instance.version,
+      'likes': instance.likes,
+      if (instance.publisherId case final value?) 'publisherId': value,
+      'isDiscontinued': instance.isDiscontinued,
+      'isLatest': instance.isLatest,
+    };
 
 PublisherData _$PublisherDataFromJson(Map<String, dynamic> json) =>
     PublisherData(
diff --git a/pkg/_pub_shared/lib/utils/flutter_archive.g.dart b/pkg/_pub_shared/lib/utils/flutter_archive.g.dart
index 346583c784..fc2ea33385 100644
--- a/pkg/_pub_shared/lib/utils/flutter_archive.g.dart
+++ b/pkg/_pub_shared/lib/utils/flutter_archive.g.dart
@@ -18,20 +18,14 @@ FlutterArchive _$FlutterArchiveFromJson(Map<String, dynamic> json) =>
           .toList(),
     );
 
-Map<String, dynamic> _$FlutterArchiveToJson(FlutterArchive instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('baseUrl', instance.baseUrl);
-  writeNotNull('current_release', instance.currentRelease?.toJson());
-  writeNotNull('releases', instance.releases?.map((e) => e.toJson()).toList());
-  return val;
-}
+Map<String, dynamic> _$FlutterArchiveToJson(FlutterArchive instance) =>
+    <String, dynamic>{
+      if (instance.baseUrl case final value?) 'baseUrl': value,
+      if (instance.currentRelease?.toJson() case final value?)
+        'current_release': value,
+      if (instance.releases?.map((e) => e.toJson()).toList() case final value?)
+        'releases': value,
+    };
 
 FlutterCurrentRelease _$FlutterCurrentReleaseFromJson(
         Map<String, dynamic> json) =>
@@ -42,20 +36,12 @@ FlutterCurrentRelease _$FlutterCurrentReleaseFromJson(
     );
 
 Map<String, dynamic> _$FlutterCurrentReleaseToJson(
-    FlutterCurrentRelease instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('beta', instance.beta);
-  writeNotNull('dev', instance.dev);
-  writeNotNull('stable', instance.stable);
-  return val;
-}
+        FlutterCurrentRelease instance) =>
+    <String, dynamic>{
+      if (instance.beta case final value?) 'beta': value,
+      if (instance.dev case final value?) 'dev': value,
+      if (instance.stable case final value?) 'stable': value,
+    };
 
 FlutterRelease _$FlutterReleaseFromJson(Map<String, dynamic> json) =>
     FlutterRelease(
@@ -70,21 +56,14 @@ FlutterRelease _$FlutterReleaseFromJson(Map<String, dynamic> json) =>
       dartSdkVersion: json['dart_sdk_version'] as String?,
     );
 
-Map<String, dynamic> _$FlutterReleaseToJson(FlutterRelease instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('hash', instance.hash);
-  writeNotNull('channel', instance.channel);
-  writeNotNull('version', instance.version);
-  writeNotNull('release_date', instance.releaseDate?.toIso8601String());
-  writeNotNull('archive', instance.archive);
-  writeNotNull('sha256', instance.sha256);
-  writeNotNull('dart_sdk_version', instance.dartSdkVersion);
-  return val;
-}
+Map<String, dynamic> _$FlutterReleaseToJson(FlutterRelease instance) =>
+    <String, dynamic>{
+      if (instance.hash case final value?) 'hash': value,
+      if (instance.channel case final value?) 'channel': value,
+      if (instance.version case final value?) 'version': value,
+      if (instance.releaseDate?.toIso8601String() case final value?)
+        'release_date': value,
+      if (instance.archive case final value?) 'archive': value,
+      if (instance.sha256 case final value?) 'sha256': value,
+      if (instance.dartSdkVersion case final value?) 'dart_sdk_version': value,
+    };
diff --git a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart
index 15f9eb9152..b9ad975777 100644
--- a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart
+++ b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart
@@ -34,7 +34,7 @@ const _totalTimeout = Duration(minutes: 50);
 
 /// The dartdoc version to use.
 /// keep in-sync with app/lib/shared/versions.dart
-const _dartdocVersion = '8.1.0';
+const _dartdocVersion = '8.3.0';
 
 /// Program to be used as subprocess for running pana, ensuring that we capture
 /// all the output, and only run analysis in a subprocess that can timeout and
@@ -99,8 +99,10 @@ Future<void> main(List<String> args) async {
   final pkgDir = Directory(p.join(pkgDownloadDir.path, '$package-$version'));
   final detected = await _detectSdks(pkgDir.path);
 
+  // Fallback for CI tests.
+  // TODO: remove after runtime SDK is migrated to 3.6 SDK
   final dartdocVersion =
-      (await _overrideDartdocVersion(pkgDir.path)) ?? _dartdocVersion;
+      Platform.version.startsWith('3.5.') ? '8.1.0' : _dartdocVersion;
 
   final toolEnv = await ToolEnvironment.create(
     dartSdkConfig: SdkConfig(
@@ -194,21 +196,6 @@ String? _configHomePath(String sdk, String kind) {
   return path;
 }
 
-/// Detects the package dependencies and overrides the dartdoc version to
-/// 8.3.0 if macros is being used.
-///
-/// TODO: remove this after the 3.6 SDK is released.
-Future<String?> _overrideDartdocVersion(String pkgDir) async {
-  final pubspecFile = File(p.join(pkgDir, 'pubspec.yaml'));
-  final pubspec = Pubspec.parseYaml(await pubspecFile.readAsString());
-  final minMacrosVersion = pubspec.getDependencyContraintRangeMin('macros');
-  if (minMacrosVersion != null &&
-      minMacrosVersion.compareTo(Version.parse('0.1.3-main.0')) >= 0) {
-    return '8.3.0';
-  }
-  return null;
-}
-
 Future<({String configKind, String? dartSdkPath, String? flutterSdkPath})>
     _detectSdks(String pkgDir) async {
   // Load the pubspec so we detect which SDK to use for analysis
@@ -423,6 +410,8 @@ Future<List<_SdkBundle>> _detectSdkBundles() async {
 
   return [
     if (latestStableDartSdkVersion != null &&
+        // TODO: remove after 3.6 SDK is released
+        !latestStableDartSdkVersion.startsWith('3.5.') &&
         latestStableFlutterSdkVersion != null)
       _SdkBundle(
         channel: 'stable',
diff --git a/pkg/pub_worker/pubspec.yaml b/pkg/pub_worker/pubspec.yaml
index c50e1fd580..bf7f499824 100644
--- a/pkg/pub_worker/pubspec.yaml
+++ b/pkg/pub_worker/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   appengine: ^0.13.6
   json_annotation: ^4.3.0
   jsontool: ^2.0.0
-  pana: ^0.22.15
+  pana: ^0.22.16
   path: ^1.8.0
   lints: ^5.0.0 # required for pana
   meta: ^1.7.0
diff --git a/pubspec.lock b/pubspec.lock
index 18abcfc229..c8ae9f261c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -58,10 +58,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
   basics:
     dependency: transitive
     description:
@@ -74,10 +74,10 @@ packages:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   build:
     dependency: transitive
     description:
@@ -154,18 +154,18 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: "81269c8d3f45541082bfbb117bbc962cfc68b5197eb4c705a00db4ddf394e1c1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -202,66 +202,66 @@ packages:
     dependency: transitive
     description:
       name: cli_util
-      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.0"
+    version: "4.10.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.19.1"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
+      sha256: "4b03e11f6d5b8f6e5bb5e9f7889a56fe6c5cbe942da5378ea4d4d7f73ef9dfe5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.2"
+    version: "1.11.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   dart_style:
     dependency: transitive
     description:
@@ -274,10 +274,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   ffi:
     dependency: transitive
     description:
@@ -298,10 +298,10 @@ packages:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   frontend_server_client:
     dependency: transitive
     description:
@@ -330,10 +330,10 @@ packages:
     dependency: transitive
     description:
       name: google_identity_services_web
-      sha256: "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6"
+      sha256: "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.1+4"
+    version: "0.3.3"
   googleapis:
     dependency: transitive
     description:
@@ -378,10 +378,10 @@ packages:
     dependency: transitive
     description:
       name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.4"
+    version: "0.15.5"
   http:
     dependency: transitive
     description:
@@ -418,10 +418,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4"
+      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.1"
   intl:
     dependency: transitive
     description:
@@ -458,10 +458,10 @@ packages:
     dependency: transitive
     description:
       name: json_serializable
-      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
+      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
       url: "https://pub.dev"
     source: hosted
-    version: "6.8.0"
+    version: "6.9.0"
   jsontool:
     dependency: transitive
     description:
@@ -490,10 +490,10 @@ packages:
     dependency: transitive
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   macros:
     dependency: transitive
     description:
@@ -570,10 +570,10 @@ packages:
     dependency: transitive
     description:
       name: native_synchronization
-      sha256: e1df9b25544d1c73e0963e6e6b11471dd6cf08116e877f7ac90d2957cd58325e
+      sha256: "047fa3665d611e178edc167e56166714f125750f064d20216892f1cca69d9d1d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.3.1"
   neat_cache:
     dependency: transitive
     description:
@@ -626,18 +626,18 @@ packages:
     dependency: transitive
     description:
       name: pana
-      sha256: f278f836a25055c549deedcb84e0ddb9436848d57c1a01d3061742a8026ab01e
+      sha256: c3f928a6517ad4eb631e839c41b61ca2895263f823c66f1a5c411596146556f1
       url: "https://pub.dev"
     source: hosted
-    version: "0.22.15"
+    version: "0.22.16"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   pem:
     dependency: transitive
     description:
@@ -690,10 +690,10 @@ packages:
     dependency: transitive
     description:
       name: puppeteer
-      sha256: a6752d4f09b510ae41911bfd0997f957e723d38facf320dd9ee0e5661108744a
+      sha256: fc33b2a12731e0b9e16c40cd91ea2b6886bcc24037a435fceb59b786d4074f2b
       url: "https://pub.dev"
     source: hosted
-    version: "3.13.0"
+    version: "3.15.0"
   retry:
     dependency: transitive
     description:
@@ -770,10 +770,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   slugid:
     dependency: transitive
     description:
@@ -858,10 +858,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   tar:
     dependency: transitive
     description:
@@ -882,26 +882,26 @@ packages:
     dependency: transitive
     description:
       name: test
-      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
+      sha256: "7afaf571fe4476e3cf7c5f822daa5a295dbbca227b52cb246d6ed3216e282f44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.8"
+    version: "1.25.10"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.4"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
+      sha256: "3e47cac78f28a4dd71ea232db15fda6345934f472c2f70f97d35476809e045ca"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   test_process:
     dependency: transitive
     description:
@@ -922,10 +922,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   ulid:
     dependency: transitive
     description:
@@ -946,10 +946,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.0"
+    version: "14.3.1"
   watcher:
     dependency: transitive
     description: