From b2f59b34dee5af5a4e74612fa14e7d6b1e73a26e Mon Sep 17 00:00:00 2001
From: Jake Macdonald <jakemac@google.com>
Date: Fri, 27 Aug 2021 13:52:04 -0700
Subject: [PATCH 1/2] update \'pub run\' references to \'dart run\'

---
 README.md                                     |  2 +-
 _test/mono_pkg.yaml                           |  4 ++--
 _test/test/common/utils.dart                  | 16 ++++++--------
 _test/test/help_test.dart                     | 10 ++++-----
 _test_null_safety/mono_pkg.yaml               |  8 +++----
 build_runner/CHANGELOG.md                     |  2 ++
 build_runner/README.md                        | 12 +++++-----
 build_runner/pubspec.yaml                     |  2 +-
 .../utils/build_descriptor.dart               |  4 ++--
 build_runner_core/CHANGELOG.md                |  4 ++++
 .../lib/src/changes/build_script_updates.dart |  2 +-
 .../lib/src/generate/options.dart             |  2 +-
 build_runner_core/pubspec.yaml                |  2 +-
 build_test/CHANGELOG.md                       |  2 ++
 build_test/README.md                          | 12 +++++-----
 build_vm_compilers/CHANGELOG.md               |  4 ++++
 build_vm_compilers/README.md                  |  2 +-
 build_vm_compilers/pubspec.yaml               |  2 +-
 build_web_compilers/CHANGELOG.md              |  1 +
 build_web_compilers/README.md                 |  2 +-
 .../lib/src/dart2js_bootstrap.dart            |  2 +-
 docs/builder_author_faq.md                    |  2 +-
 docs/faq.md                                   | 10 ++++-----
 docs/getting_started.md                       |  6 ++---
 docs/travis.md                                | 22 +++++++++----------
 25 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 6d71a1d609..a4b0e1f2a3 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,6 @@ TODO: scratch_space
 The [example](https://github.com/dart-lang/build/tree/master/example)
 directory has an example of a build with custom builders which generate outputs
 into both the source tree and a hidden generated directory. Try a build with
-`pub run build_runner build -o web:deploy` to see what the output looks like.
+`dart run build_runner build -o web:deploy` to see what the output looks like.
 
 Most projects should not need custom builders.
diff --git a/_test/mono_pkg.yaml b/_test/mono_pkg.yaml
index b7441d49f6..98f5819a7b 100644
--- a/_test/mono_pkg.yaml
+++ b/_test/mono_pkg.yaml
@@ -11,8 +11,8 @@ stages:
     os: linux
 - unit_test:
   - group:
-    - command: pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random
-    - command: pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random
+    - command: dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random
+    - command: dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random
 - e2e_test:
   - test: --total-shards 3 --shard-index 0 --test-randomize-ordering-seed=random
     os: linux
diff --git a/_test/test/common/utils.dart b/_test/test/common/utils.dart
index 08cc235242..c5bb26b496 100644
--- a/_test/test/common/utils.dart
+++ b/_test/test/common/utils.dart
@@ -17,18 +17,16 @@ Process? _process;
 Stream<String>? _stdOutLines;
 Stream<String>? get stdOutLines => _stdOutLines;
 
-final String _pubBinary = Platform.isWindows ? 'pub.bat' : 'pub';
-
-/// Runs a single build using `pub run build_runner build`, and returns the
+/// Runs a single build using `dart run build_runner build`, and returns the
 /// [ProcessResult].
 Future<ProcessResult> runBuild({List<String> trailingArgs = const []}) =>
-    _runBuild(_pubBinary, ['run', 'build_runner', 'build', ...trailingArgs]);
+    _runBuild('dart', ['run', 'build_runner', 'build', ...trailingArgs]);
 
-/// Runs `pub run build_runner <args>`, and returns the [ProcessResult].
+/// Runs `dart run build_runner <args>`, and returns the [ProcessResult].
 Future<ProcessResult> runCommand(List<String> args) =>
-    _runBuild(_pubBinary, ['run', 'build_runner', ...args]);
+    _runBuild('dart', ['run', 'build_runner', ...args]);
 
-/// Runs `pub run build_runner serve` in this package, and waits for the first
+/// Runs `dart run build_runner serve` in this package, and waits for the first
 /// build to complete.
 ///
 /// To ensure a clean build, set [ensureCleanBuild] to `true`.
@@ -163,7 +161,7 @@ Future<TestProcess> runTests(
     {bool? usePrecompiled,
     List<String>? buildArgs,
     List<String>? testArgs}) async {
-  return _runTests(_pubBinary, ['run', 'build_runner'],
+  return _runTests('dart', ['run', 'build_runner'],
       usePrecompiled: usePrecompiled, buildArgs: buildArgs, testArgs: testArgs);
 }
 
@@ -184,7 +182,7 @@ Future<TestProcess> _runTests(String executable, List<String> scriptArgs,
     return TestProcess.start(executable, args);
   } else {
     var args = ['run', 'test', '--pub-serve', '8081', ...testArgs];
-    return TestProcess.start(_pubBinary, args);
+    return TestProcess.start('dart', args);
   }
 }
 
diff --git a/_test/test/help_test.dart b/_test/test/help_test.dart
index 54c7ef4f1c..781b188c0b 100644
--- a/_test/test/help_test.dart
+++ b/_test/test/help_test.dart
@@ -10,35 +10,35 @@ import 'package:test/test.dart';
 import 'common/utils.dart';
 
 void main() {
-  test('pub run build_runner help', () async {
+  test('dart run build_runner help', () async {
     await _testHelpCommand(['help'],
         checkContent: 'Unified interface for running Dart builds.');
     await _testHelpCommand(['--help'],
         checkContent: 'Unified interface for running Dart builds.');
   });
 
-  test('pub run build_runner build --help', () async {
+  test('dart run build_runner build --help', () async {
     await _testHelpCommand(['build', '--help'],
         checkContent: 'Performs a single build on the specified targets');
     await _testHelpCommand(['help', 'build'],
         checkContent: 'Performs a single build on the specified targets');
   });
 
-  test('pub run build_runner serve --help', () async {
+  test('dart run build_runner serve --help', () async {
     await _testHelpCommand(['serve', '--help'],
         checkContent: 'Runs a development server');
     await _testHelpCommand(['help', 'serve'],
         checkContent: 'Runs a development server');
   });
 
-  test('pub run build_runner test --help', () async {
+  test('dart run build_runner test --help', () async {
     await _testHelpCommand(['test', '--help'],
         checkContent: 'and then runs tests using');
     await _testHelpCommand(['help', 'test'],
         checkContent: 'and then runs tests using');
   });
 
-  test('pub run build_runner watch --help', () async {
+  test('dart run build_runner watch --help', () async {
     await _testHelpCommand(['watch', '--help'],
         checkContent: 'watching the file system for updates');
     await _testHelpCommand(['help', 'watch'],
diff --git a/_test_null_safety/mono_pkg.yaml b/_test_null_safety/mono_pkg.yaml
index 854959e0b8..51f6a1110f 100644
--- a/_test_null_safety/mono_pkg.yaml
+++ b/_test_null_safety/mono_pkg.yaml
@@ -12,12 +12,12 @@ stages:
     dart: dev
 - e2e_test:
   - group:
-    - command: pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random
-    - command: pub run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random
+    - command: dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random
+    - command: dart run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random
 # This stage is configured to only run for scheduled builds (see mono_repo.yaml)
 - e2e_test_cron:
   - group:
-    - command: pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random
-    - command: pub run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random
+    - command: dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random
+    - command: dart run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random
     dart:
       - be/raw/latest
diff --git a/build_runner/CHANGELOG.md b/build_runner/CHANGELOG.md
index fda8b03cb6..73270457a1 100644
--- a/build_runner/CHANGELOG.md
+++ b/build_runner/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 2.1.2-dev
+
 ## 2.1.1
 
 - Don't rethrow file watcher errors - instead log at severe level and continue
diff --git a/build_runner/README.md b/build_runner/README.md
index e64beb3353..b3c9d967c3 100644
--- a/build_runner/README.md
+++ b/build_runner/README.md
@@ -61,7 +61,7 @@ To have web code compiled to js add a `dev_dependency` on `build_web_compilers`.
 ### Built-in Commands
 
 The `build_runner` package exposes a binary by the same name, which can be
-invoked using `pub run build_runner <command>`.
+invoked using `dart run build_runner <command>`.
 
 The available commands are `build`, `watch`, `serve`, and `test`.
 
@@ -72,7 +72,7 @@ The available commands are `build`, `watch`, `serve`, and `test`.
   - By default this serves the `web` and `test` directories, on port `8080` and
     `8081` respectively. See below for how to configure this.
 - `test`: Runs a single build, creates a merged output directory, and then runs
-  `pub run test --precompiled <merged-output-dir>`. See below for instructions
+  `dart run test --precompiled <merged-output-dir>`. See below for instructions
   on passing custom args to the test command.
 
 #### Command Line Options
@@ -97,15 +97,15 @@ Trailing args of the form `<directory>:<port>` are supported to customize what
 directories are served, and on what ports.
 
 For example to serve the `example` and `web` directories on ports 8000 and 8001
-you would do `pub run build_runner serve example:8000 web:8001`.
+you would do `dart run build_runner serve example:8000 web:8001`.
 
 ##### test
 
 The test command will forward any arguments after an empty `--` arg to the
-`pub run test` command.
+`dart run test` command.
 
 For example if you wanted to pass `-p chrome` you would do
-`pub run build_runner test -- -p chrome`.
+`dart run build_runner test -- -p chrome`.
 
 ### Inputs
 
@@ -219,7 +219,7 @@ $ dartfmt -w .
 Run all of our unit tests:
 
 ```sh
-$ pub run test
+$ dart run test
 ```
 
 [Bazel]: https://bazel.build/
diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
index 108463aad8..82751dc755 100644
--- a/build_runner/pubspec.yaml
+++ b/build_runner/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_runner
-version: 2.1.1
+version: 2.1.2-dev
 description: A build system for Dart code generation and modular compilation.
 repository: https://github.com/dart-lang/build/tree/master/build_runner
 
diff --git a/build_runner/test/integration_tests/utils/build_descriptor.dart b/build_runner/test/integration_tests/utils/build_descriptor.dart
index 73dbbecfc3..d3f7894b07 100644
--- a/build_runner/test/integration_tests/utils/build_descriptor.dart
+++ b/build_runner/test/integration_tests/utils/build_descriptor.dart
@@ -83,7 +83,7 @@ Map _builderDefinition(TestBuilderDefinition builder) => {
     };
 
 /// Create a package in [d.sandbox] with dependencies on [otherPackages] set up
-/// to run their builders with `pub run build_runner`.
+/// to run their builders with `dart run build_runner`.
 ///
 /// The package name is always 'a'.
 ///
@@ -262,7 +262,7 @@ d.FileDescriptor _pubspec(String name,
 
 /// An executable that can run builds.
 ///
-/// Either a manual build script or `pub run build_runner`.
+/// Either a manual build script or `dart run build_runner`.
 class BuildTool {
   final String _executable;
   final List<String> _baseArgs;
diff --git a/build_runner_core/CHANGELOG.md b/build_runner_core/CHANGELOG.md
index 6e52df661f..e561936826 100644
--- a/build_runner_core/CHANGELOG.md
+++ b/build_runner_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.1.1-dev
+
+- Update `pub run` references to `dart run`.
+
 ## 7.1.0
 
 - Support capture groups, a feature introduced in `build`: `2.1.0`.
diff --git a/build_runner_core/lib/src/changes/build_script_updates.dart b/build_runner_core/lib/src/changes/build_script_updates.dart
index 68de696bdd..fefd64ee92 100644
--- a/build_runner_core/lib/src/changes/build_script_updates.dart
+++ b/build_runner_core/lib/src/changes/build_script_updates.dart
@@ -111,7 +111,7 @@ class _MirrorBuildScriptUpdates implements BuildScriptUpdates {
         throw ArgumentError('Unsupported uri scheme `${uri.scheme}` found for '
             'library in build script.\n'
             'This probably means you are running in an unsupported '
-            'context, such as in an isolate or via `pub run`.\n'
+            'context, such as in an isolate or via `dart run`.\n'
             'Full uri was: $uri.');
     }
     return null;
diff --git a/build_runner_core/lib/src/generate/options.dart b/build_runner_core/lib/src/generate/options.dart
index ce4e524311..64887d09ad 100644
--- a/build_runner_core/lib/src/generate/options.dart
+++ b/build_runner_core/lib/src/generate/options.dart
@@ -195,7 +195,7 @@ class BuildOptions {
 Failed to parse `build.yaml` for ${e.packageName}.
 
 If you believe you have gotten this message in error, especially if using a new
-feature, you may need to run `pub run build_runner clean` and then rebuild.
+feature, you may need to run `dart run build_runner clean` and then rebuild.
 ''', e.exception, s);
       throw CannotBuildException();
     }
diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml
index 175d5dcbb7..e4025b3be8 100644
--- a/build_runner_core/pubspec.yaml
+++ b/build_runner_core/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_runner_core
-version: 7.1.0
+version: 7.1.1-dev
 description: Core tools to write binaries that run builders.
 repository: https://github.com/dart-lang/build/tree/master/build_runner_core
 
diff --git a/build_test/CHANGELOG.md b/build_test/CHANGELOG.md
index 4a572f8ed6..1d29dea115 100644
--- a/build_test/CHANGELOG.md
+++ b/build_test/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 2.1.4-dev
 
+- Update `pub run` references to `dart run`.
+
 ## 2.1.3
 
 - Use `allowedOutputs` in `TestBuilder` instead of computing them again.
diff --git a/build_test/README.md b/build_test/README.md
index 882405b9d1..1e57557554 100644
--- a/build_test/README.md
+++ b/build_test/README.md
@@ -28,24 +28,24 @@ dev_dependencies:
 
 ## Running tests
 
-To run tests, you should go through the `pub run build_runner test` command.
+To run tests, you should go through the `dart run build_runner test` command.
 This will compile all your tests to a temp directory and run them using
-`pub run test`. If you would like to see the output directory, you can use the
+`dart run test`. If you would like to see the output directory, you can use the
 `--output=<dir>` option to force the output to go to a specific place.
 
-### Forwarding additional args to `pub run test`
+### Forwarding additional args to `dart run test`
 
 It is very common to need to pass some arguments through to the eventual call
-to `pub run test`. To do this, add all those args after an empty `--` arg.
+to `dart run test`. To do this, add all those args after an empty `--` arg.
 
 For example, to run all chrome platform tests you would do
-`pub run build_runner test -- -p chrome`.
+`dart run build_runner test -- -p chrome`.
 
 ## Debugging web tests
 
 This package will automatically create `*.debug.html` files next to all your
 `*_test.dart` files, which can be loaded in a browser from the normal
-development server (`pub run build_runner serve`).
+development server (`dart run build_runner serve`).
 
 **Note:** In order to run the tests this way, you will need to configure them
 to be compiled (by default we only compile `*.browser_test.dart` files). You
diff --git a/build_vm_compilers/CHANGELOG.md b/build_vm_compilers/CHANGELOG.md
index b2c5887d48..7c309ce4f0 100644
--- a/build_vm_compilers/CHANGELOG.md
+++ b/build_vm_compilers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.10-dev
+
+- Update `pub run` references to `dart run`.
+
 ## 1.0.9
 
 - Allow analyzer version 2.x.x.
diff --git a/build_vm_compilers/README.md b/build_vm_compilers/README.md
index 5f3f933f67..cba89c91ef 100644
--- a/build_vm_compilers/README.md
+++ b/build_vm_compilers/README.md
@@ -29,7 +29,7 @@ multiple entrypoints, instead of doing a monolithic compile of each entrypoint
 like the Dart VM would normally do on each run.
 
 **Note**: If you want to use this package for running tests with
-`pub run build_runner test` you will also need a `build_test` dev dependency.
+`dart run build_runner test` you will also need a `build_test` dev dependency.
 
 ## Usage
 
diff --git a/build_vm_compilers/pubspec.yaml b/build_vm_compilers/pubspec.yaml
index f8d9baece8..a5385b4300 100644
--- a/build_vm_compilers/pubspec.yaml
+++ b/build_vm_compilers/pubspec.yaml
@@ -1,5 +1,5 @@
 name: build_vm_compilers
-version: 1.0.9
+version: 1.0.10-dev
 description: Builder implementations wrapping Dart VM compilers.
 repository: https://github.com/dart-lang/build/tree/master/build_vm_compilers
 
diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md
index 29459d2c5a..0a5c3ad169 100644
--- a/build_web_compilers/CHANGELOG.md
+++ b/build_web_compilers/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 3.2.1-dev
 
+- Update `pub run` references to `dart run`.
 - Fix `doctor` command warnings for this package.
 
 ## 3.2.0
diff --git a/build_web_compilers/README.md b/build_web_compilers/README.md
index 49023ba793..06e22ff360 100644
--- a/build_web_compilers/README.md
+++ b/build_web_compilers/README.md
@@ -34,7 +34,7 @@ dev_dependencies:
 ## Usage
 
 If you are using the autogenerated build script (going through
-`pub run build_runner <command>` instead of handwriting a `build.dart` file),
+`dart run build_runner <command>` instead of handwriting a `build.dart` file),
 then all you need is the `dev_dependency` listed above.
 
 ## Configuration
diff --git a/build_web_compilers/lib/src/dart2js_bootstrap.dart b/build_web_compilers/lib/src/dart2js_bootstrap.dart
index 586b70172b..8d899971e6 100644
--- a/build_web_compilers/lib/src/dart2js_bootstrap.dart
+++ b/build_web_compilers/lib/src/dart2js_bootstrap.dart
@@ -193,7 +193,7 @@ void _validateUserArgs(List<String> args) {
       log.warning(
           'Detected a manual enable experiment dart2js argument `$arg`, '
           'this should be enabled on the command line instead, for example: '
-          '`pub run build_runner --enable-experiment=<experiment> <command>`.');
+          '`dart run build_runner --enable-experiment=<experiment> <command>`.');
     }
   }
 }
diff --git a/docs/builder_author_faq.md b/docs/builder_author_faq.md
index 62c0d45aa6..926858862d 100644
--- a/docs/builder_author_faq.md
+++ b/docs/builder_author_faq.md
@@ -74,7 +74,7 @@ After running a build, or by running the `generate-build-script` command, a
 build script will be written to `.dart_tool/build/entrypoint/build.dart`. This
 is a Dart VM application that can be run manually, including with debugging
 enabled. See the [devtool docs][] or [IntelliJ debugging docs][]
-for usage instructions. The build script takes the same arguments as `pub run
+for usage instructions. The build script takes the same arguments as `dart run
 build_runner`, for example:
 
 `dart --observe --pause-isolates-on-start .dart_tool/build/entrypoint/build.dart
diff --git a/docs/faq.md b/docs/faq.md
index 5cc0a418a7..d15cbab6bc 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -12,7 +12,7 @@ targets:
   $default:
     builders:
       # Typically the builder key is just the package name, run
-      # `pub run build_runner doctor` to check your config.
+      # `dart run build_runner doctor` to check your config.
       <builder-key>:
         generate_for:
           # Example glob for only the Dart files under `lib/models`
@@ -98,9 +98,9 @@ targets:
 If you need other configurations in addition to dev and release, you can define
 multiple `build.yaml` files. For instance if you have a `build.debug.yaml` file
 you can build with `--config debug` and this file will be used instead of the
-default `build.yaml`. The dev and release flavors still apply. `pub run
+default `build.yaml`. The dev and release flavors still apply. `dart run
 build_runner serve --config debug` will use the `dev_options` in
-`build.debug.yaml`, while `pub run build_runner build --config debug --release`
+`build.debug.yaml`, while `dart run build_runner build --config debug --release`
 will use the `release_options` in `build.debug.yaml`.
 
 Only one build flavor can be built at a time. It is not possible to have
@@ -163,7 +163,7 @@ global_options:
 And when running the build:
 
 ```
-pub run build_runner build --define=some_package:some_builder=some_option="Priority 6"
+dart run build_runner build --define=some_package:some_builder=some_option="Priority 6"
 ```
 
 ## How can I include additional sources in my build?
@@ -242,7 +242,7 @@ action fails, and a subsequent build has exactly the same inputs for that action
 it will not be rerun - the previous error messages, however, will get reprinted
 to avoid confusion if a build fails with no printed errors. To force the action
 to run again make an edit to any file that is an input to that action, or throw
-away all cached values with `pub run build_runner clean` before starting the
+away all cached values with `dart run build_runner clean` before starting the
 next build.
 
 ## How can I resolve "Skipped compiling" warnings?
diff --git a/docs/getting_started.md b/docs/getting_started.md
index c24f1c3ea0..e92624071a 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -38,7 +38,7 @@ If you have issues using `build_runner`, see the
 3.  Start the server:
 
     ```sh
-    pub run build_runner serve
+    dart run build_runner serve
     ```
 
 While the `serve` command runs, every change you save triggers a rebuild.
@@ -70,13 +70,13 @@ In addition to **serve** you can use:
     This can be used to keep the outputs updated for use with another
     filed-based development server.
 
--   **test:** Creates an output directory and runs `pub run test` within it.
+-   **test:** Creates an output directory and runs `dart run test` within it.
     This command requires a dev dependency on `build_test`.
 
 ## Switching to dart2js
 
 By default `build_web_compilers` uses dartdevc. To switch to dart2js, pass
-`--release` to `pub run build_runner build` (or `serve`). Pass args to dart2js
+`--release` to `dart run build_runner build` (or `serve`). Pass args to dart2js
 by creating a `build.yaml` file.
 
 ```yaml
diff --git a/docs/travis.md b/docs/travis.md
index 75968566ac..b5f54971d0 100644
--- a/docs/travis.md
+++ b/docs/travis.md
@@ -49,7 +49,7 @@ Then you will need to update it to be a normal `script` job, which invokes the
 
 ```yaml
 script:
-  - pub run build_runner test
+  - dart run build_runner test
 ```
 
 **Note:** If you are running out of memory due to large builds, you can use the
@@ -78,7 +78,7 @@ jobs:
     # This stage builds the entire `test` directory
     - stage: build
       script:
-        - pub run build_runner build test
+        - dart run build_runner build test
     # Set up several jobs in the next stage, using the built in sharding
     # feature from the `test` package.
     #
@@ -87,16 +87,16 @@ jobs:
     # properly above!).
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 0
+        - dart run build_runner test -- --total-shards 4 --shard-index 0
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 1
+        - dart run build_runner test -- --total-shards 4 --shard-index 1
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 2
+        - dart run build_runner test -- --total-shards 4 --shard-index 2
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 3
+        - dart run build_runner test -- --total-shards 4 --shard-index 3
 
 # Specify the ordering of your stages
 stages:
@@ -135,7 +135,7 @@ jobs:
     # Next, build the entire `test` directory
     - stage: build
       script:
-        - pub run build_runner build test
+        - dart run build_runner build test
     # Set up several jobs in the next stage, using the built in sharding
     # feature from the `test` package.
     #
@@ -144,16 +144,16 @@ jobs:
     # properly above!).
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 0
+        - dart run build_runner test -- --total-shards 4 --shard-index 0
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 1
+        - dart run build_runner test -- --total-shards 4 --shard-index 1
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 2
+        - dart run build_runner test -- --total-shards 4 --shard-index 2
     - stage: unit_test
       script:
-        - pub run build_runner test -- --total-shards 4 --shard-index 3
+        - dart run build_runner test -- --total-shards 4 --shard-index 3
 
 # Specify the ordering of your stages
 stages:

From 2e926524f2d77c504306d00812b3dbeaf573d7ce Mon Sep 17 00:00:00 2001
From: Jake Macdonald <jakemac@google.com>
Date: Fri, 27 Aug 2021 13:53:02 -0700
Subject: [PATCH 2/2] re-run mono_repo

---
 .github/workflows/dart.yml | 60 +++++++++++++++++++-------------------
 tool/ci.sh                 | 16 +++++-----
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index c95b3f4ef8..83f91a4d1b 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -566,7 +566,7 @@ jobs:
       - job_007
       - job_008
   job_013:
-    name: "unit_test; linux; Dart dev; PKG: _test; `pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random`, `pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`"
+    name: "unit_test; linux; Dart dev; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`, `dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -589,14 +589,14 @@ jobs:
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test
         run: dart pub upgrade
-      - name: "_test; pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
+      - name: "_test; dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
         if: "always() && steps._test_pub_upgrade.conclusion == 'success'"
         working-directory: _test
-        run: "pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
-      - name: "_test; pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
+      - name: "_test; dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
         if: "always() && steps._test_pub_upgrade.conclusion == 'success'"
         working-directory: _test
-        run: "pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
     needs:
       - job_001
       - job_002
@@ -1122,7 +1122,7 @@ jobs:
       - job_007
       - job_008
   job_029:
-    name: "unit_test; windows; Dart dev; PKG: _test; `pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random`, `pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`"
+    name: "unit_test; windows; Dart dev; PKG: _test; `dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random`, `dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - uses: dart-lang/setup-dart@v1.2
@@ -1135,14 +1135,14 @@ jobs:
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test
         run: dart pub upgrade
-      - name: "_test; pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
+      - name: "_test; dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
         if: "always() && steps._test_pub_upgrade.conclusion == 'success'"
         working-directory: _test
-        run: "pub.bat run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
-      - name: "_test; pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random"
+      - name: "_test; dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
         if: "always() && steps._test_pub_upgrade.conclusion == 'success'"
         working-directory: _test
-        run: "pub.bat run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random"
     needs:
       - job_001
       - job_002
@@ -1627,7 +1627,7 @@ jobs:
       - job_038
       - job_039
   job_043:
-    name: "e2e_test; linux; Dart dev; PKG: _test_null_safety; `pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
+    name: "e2e_test; linux; Dart dev; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -1650,14 +1650,14 @@ jobs:
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_null_safety
         run: dart pub upgrade
-      - name: "_test_null_safety; pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
-      - name: "_test_null_safety; pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
     needs:
       - job_001
       - job_002
@@ -2213,7 +2213,7 @@ jobs:
       - job_038
       - job_039
   job_052:
-    name: "e2e_test; windows; Dart dev; PKG: _test_null_safety; `pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
+    name: "e2e_test; windows; Dart dev; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - uses: dart-lang/setup-dart@v1.2
@@ -2226,14 +2226,14 @@ jobs:
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_null_safety
         run: dart pub upgrade
-      - name: "_test_null_safety; pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub.bat run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
-      - name: "_test_null_safety; pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub.bat run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
     needs:
       - job_001
       - job_002
@@ -2357,7 +2357,7 @@ jobs:
       - job_051
       - job_052
   job_054:
-    name: "e2e_test_cron; linux; Dart main; PKG: _test_null_safety; `pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
+    name: "e2e_test_cron; linux; Dart main; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
@@ -2380,14 +2380,14 @@ jobs:
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_null_safety
         run: dart pub upgrade
-      - name: "_test_null_safety; pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
-      - name: "_test_null_safety; pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
     if: "github.event_name == 'schedule'"
     needs:
       - job_001
@@ -2515,7 +2515,7 @@ jobs:
       - job_051
       - job_052
   job_056:
-    name: "e2e_test_cron; windows; Dart main; PKG: _test_null_safety; `pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
+    name: "e2e_test_cron; windows; Dart main; PKG: _test_null_safety; `dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random`, `dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random`"
     runs-on: windows-latest
     steps:
       - uses: dart-lang/setup-dart@v1.2
@@ -2528,14 +2528,14 @@ jobs:
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: _test_null_safety
         run: dart pub upgrade
-      - name: "_test_null_safety; pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub.bat run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
-      - name: "_test_null_safety; pub run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random"
+      - name: "_test_null_safety; dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
         if: "always() && steps._test_null_safety_pub_upgrade.conclusion == 'success'"
         working-directory: _test_null_safety
-        run: "pub.bat run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
+        run: "dart run build_runner test --define=\"build_web_compilers:entrypoint=compiler=dart2js\" -- -p chrome --test-randomize-ordering-seed=random"
     if: "github.event_name == 'schedule'"
     needs:
       - job_001
diff --git a/tool/ci.sh b/tool/ci.sh
index a170b169dc..39536700ac 100755
--- a/tool/ci.sh
+++ b/tool/ci.sh
@@ -76,20 +76,20 @@ for PKG in ${PKGS}; do
         dart analyze --fatal-infos || EXIT_CODE=$?
         ;;
       command_0)
-        echo 'pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random'
-        pub run build_runner test -- -p chrome --test-randomize-ordering-seed=random || EXIT_CODE=$?
+        echo 'dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random'
+        dart run build_runner test -- -p chrome --test-randomize-ordering-seed=random || EXIT_CODE=$?
         ;;
       command_1)
-        echo 'pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random'
-        pub run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random || EXIT_CODE=$?
+        echo 'dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random'
+        dart run build_runner test -- -p vm test/configurable_uri_test.dart --test-randomize-ordering-seed=random || EXIT_CODE=$?
         ;;
       command_2)
-        echo 'pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random'
-        pub run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random || EXIT_CODE=$?
+        echo 'dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random'
+        dart run build_runner test -- -p chrome,vm --test-randomize-ordering-seed=random || EXIT_CODE=$?
         ;;
       command_3)
-        echo 'pub run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random'
-        pub run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random || EXIT_CODE=$?
+        echo 'dart run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random'
+        dart run build_runner test --define="build_web_compilers:entrypoint=compiler=dart2js" -- -p chrome --test-randomize-ordering-seed=random || EXIT_CODE=$?
         ;;
       format)
         echo 'dart format --output=none --set-exit-if-changed .'