Version 3.6.0-0.0.dev

Merge 4d57de8 into dev

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.6.0
+
 ## 3.5.0
 
 ### Language

DEPS

@@ -50,7 +50,7 @@ vars = {
   # Checked-in SDK version. The checked-in SDK is a Dart SDK distribution
   # in a cipd package used to run Dart scripts in the build and test
   # infrastructure, which is automatically built on the release commits.
-  "sdk_tag": "version:3.5.0-278.0.dev",
+  "sdk_tag": "version:3.5.0-307.0.dev",
 
   # co19 is a cipd package automatically generated for each co19 commit.
   # Use tests/co19/update.sh to update this hash.

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

@@ -6,7 +6,7 @@
 //
 // Instead modify 'tools/experimental_features.yaml' and run
 // 'dart pkg/front_end/tool/fasta.dart generate-experimental-flags' to update.
-const Version defaultLanguageVersion = const Version(3, 5);
+const Version defaultLanguageVersion = const Version(3, 6);
 
 /// Enum for experimental flags shared between the CFE and the analyzer.
 enum ExperimentalFlag {

pkg/analysis_server/benchmark/integration/input_converter.dart

@@ -94,7 +94,8 @@ abstract class CommonInputConverter extends Converter<String, Operation?> {
       // Track overlays in parallel with the analysis server
       // so that when an overlay is removed, the file can be updated on disk
       var request = Request.fromJson(json)!;
-      var params = AnalysisUpdateContentParams.fromRequest(request);
+      var params = AnalysisUpdateContentParams.fromRequest(request,
+          clientUriConverter: null);
       params.files.forEach((String filePath, change) {
         if (change is AddContentOverlay) {
           var content = change.content;

pkg/analysis_server/lib/protocol/protocol.dart

@@ -517,7 +517,7 @@ class Response extends RequestOrResponse {
     jsonObject[ID] = id;
     var error = this.error;
     if (error != null) {
-      jsonObject[ERROR] = error.toJson();
+      jsonObject[ERROR] = error.toJson(clientUriConverter: null);
     }
     var result = this.result;
     if (result != null) {
@@ -537,8 +537,9 @@ class Response extends RequestOrResponse {
       RequestError? decodedError;
       var error = json[Response.ERROR];
       if (error is Map) {
-        decodedError =
-            RequestError.fromJson(ResponseDecoder(null), '.error', error);
+        decodedError = RequestError.fromJson(
+            ResponseDecoder(null), '.error', error,
+            clientUriConverter: null);
       }
 
       Map<String, Object?>? decodedResult;