commit 0c7d07706d9472f83457ebc15e126063281754dc
author Dart CI <dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com> Thu Jan 20 00:56:59 2022 -0800
committer Dart CI <dart-luci-ci-builder@dart-ci.iam.gserviceaccount.com> Thu Jan 20 00:56:59 2022 -0800
tree a91f50c53ed27cd8bffad35472b337b210b48b4f
parent ff0b0405c13ae8ebfc0f550f98ac0fcfa264624e
parent e557fef27df75d392ad3846c2bc79e9aab321d98

Version 2.17.0-36.0.dev

Merge commit 'e557fef27df75d392ad3846c2bc79e9aab321d98' into 'dev'

pkg/dartdev/test/smoke/smoke_test.dart

diff --git a/pkg/dartdev/test/smoke/smoke_test.dart b/pkg/dartdev/test/smoke/smoke_test.dart
index 38dd049..671836d 100644
--- a/pkg/dartdev/test/smoke/smoke_test.dart
+++ b/pkg/dartdev/test/smoke/smoke_test.dart
@@ -63,7 +63,7 @@
         );
         expect(
           result.stderr,
-          'Could not start Observatory HTTP server: localhost:${server.port} is already in use.\n',
+          'Could not start VM service: localhost:${server.port} is already in use.\n',
         );
         expect(result.stdout, isEmpty);
         server.close();

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index 0107d24..dd07624 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 17
 PATCH 0
-PRERELEASE 35
+PRERELEASE 36
 PRERELEASE_PATCH 0
\ No newline at end of file