Version 2.18.0-3.0.dev
Merge commit 'df0ebab22bc089330d580b5dd7d4d70f928be41a' into 'dev'
diff --git a/pkg/analysis_server/test/analysis_server_base.dart b/pkg/analysis_server/test/analysis_server_base.dart
index 804f079..bdbd4ea 100644
--- a/pkg/analysis_server/test/analysis_server_base.dart
+++ b/pkg/analysis_server/test/analysis_server_base.dart
@@ -112,6 +112,8 @@
String get testPackageTestPath => '$testPackageRootPath/test';
+ Folder get workspaceRoot => getFolder(workspaceRootPath);
+
String get workspaceRootPath => '/home';
Future<void> addAnalysisSubscription(
diff --git a/pkg/analysis_server/test/edit/bulk_fixes_test.dart b/pkg/analysis_server/test/edit/bulk_fixes_test.dart
index 41c6916..00c07ca 100644
--- a/pkg/analysis_server/test/edit/bulk_fixes_test.dart
+++ b/pkg/analysis_server/test/edit/bulk_fixes_test.dart
@@ -267,7 +267,7 @@
}
Future<EditBulkFixesResult> _getBulkFixes() async {
- var request = EditBulkFixesParams([workspaceRootPath]).toRequest('0');
+ var request = EditBulkFixesParams([workspaceRoot.path]).toRequest('0');
var response = await handleSuccessfulRequest(request);
return EditBulkFixesResult.fromResponse(response);
}
diff --git a/pkg/compiler/test/end_to_end/trim_component_test.dart b/pkg/compiler/test/end_to_end/trim_component_test.dart
index 3673cbf..025b1db 100644
--- a/pkg/compiler/test/end_to_end/trim_component_test.dart
+++ b/pkg/compiler/test/end_to_end/trim_component_test.dart
@@ -2,6 +2,8 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
+// @dart = 2.10
+
import 'package:expect/expect.dart';
import 'package:kernel/ast.dart' as ir;
import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder;
diff --git a/tools/VERSION b/tools/VERSION
index fa9e9de..31ccebe 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 18
PATCH 0
-PRERELEASE 2
+PRERELEASE 3
PRERELEASE_PATCH 0
\ No newline at end of file
