commit 613f781629190aa9072122449af34f326393311b
author Dart CI <dart-internal-sdk-dev-roller@dart-ci-internal.iam.gserviceaccount.com> Sat May 07 17:35:03 2022 -0700
committer Dart CI <dart-internal-sdk-dev-roller@dart-ci-internal.iam.gserviceaccount.com> Sat May 07 17:35:03 2022 -0700
tree 46995201be0c85b9f58c0d3ab616a538d6611c97
parent f6f4b36e8f4d6fc91e064b63b935209ef4731712
parent c8e3fe3d7f8cb1e4b39367a9c01b29b8b4ff6639

Version 2.18.0-97.0.dev

Merge commit 'c8e3fe3d7f8cb1e4b39367a9c01b29b8b4ff6639' into 'dev'

pkg/analyzer/lib/src/fasta/ast_builder.dart

diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index 8182731..7ccf2f3 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -1537,7 +1537,7 @@
       handleRecoverableError(
         templateExperimentNotEnabled.withArguments(
           feature.enableString,
-          _versionAsString(ExperimentStatus.currentVersion),
+          _versionAsString(feature.releaseVersion!),
         ),
         superKeyword,
         superKeyword,
@@ -2925,7 +2925,7 @@
       handleRecoverableError(
         templateExperimentNotEnabled.withArguments(
           feature.enableString,
-          _versionAsString(ExperimentStatus.currentVersion),
+          _versionAsString(feature.releaseVersion!),
         ),
         token,
         token,
@@ -2981,7 +2981,7 @@
       handleRecoverableError(
         templateExperimentNotEnabled.withArguments(
           feature.enableString,
-          _versionAsString(ExperimentStatus.currentVersion),
+          _versionAsString(feature.releaseVersion!),
         ),
         elementsEndToken,
         elementsEndToken,
@@ -3015,7 +3015,7 @@
       handleRecoverableError(
         templateExperimentNotEnabled.withArguments(
           feature.enableString,
-          _versionAsString(ExperimentStatus.currentVersion),
+          _versionAsString(feature.releaseVersion!),
         ),
         token,
         token,

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 6f28dc4..8801e20 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 18
 PATCH 0
-PRERELEASE 96
+PRERELEASE 97
 PRERELEASE_PATCH 0
\ No newline at end of file