dart-lang · dcharkes · Apr 8, 2025 · Apr 7, 2025
diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml
@@ -57,104 +57,12 @@ jobs:
 
       - run: dart pub get
 
-      - run: dart pub get -C test_data/dart_app/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_add/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_add_duplicate/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_add_add_source/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
       - run: dart pub get -C test_data/native_add_version_skew/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
       - run: dart pub get -C test_data/native_add_version_skew_2/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test_data/native_subtract/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/package_reading_metadata/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/package_with_metadata/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/simple_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/complex_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/complex_link_helper/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/drop_dylib_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/add_asset_link/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/transformer/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/treeshaking_native_libs/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/native_dynamic_linking/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/reusable_dynamic_library/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/reuse_dynamic_library/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/user_defines/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/no_hook/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C example/build/download_asset/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/native_dynamic_linking/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/native_add_app/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/native_add_library/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/use_dart_api/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/build/system_library/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/link/package_with_assets/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-
-      - run: dart pub get -C example/link/app_with_asset_treeshaking/
-        if: ${{ matrix.package == 'native_assets_cli' }}
-      - run: dart pub get -C test_data/fail_build/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/depend_on_fail_build/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/depend_on_fail_build_app/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
-      - run: dart pub get -C test_data/system_library/
-        if: ${{ matrix.package == 'native_assets_builder' }}
-
       - run: dart analyze --fatal-infos
         # Run on dev to ensure we're not depending on deprecated SDK things.
 
@@ -166,16 +74,18 @@ jobs:
 
       - run: dart test
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/native_dynamic_linking/
-        # TODO(https://github.com/dart-lang/native/issues/190): Enable on windows once
-        # https://github.com/dart-lang/sdk/commit/903eea6bfb8ee405587f0866a1d1e92eea45d29e
-        # has landed in dev channel.
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change && matrix.os != 'windows' }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/native_dynamic_linking/
+      #   # TODO(https://github.com/dart-lang/native/issues/190): Enable on windows once
+      #   # https://github.com/dart-lang/sdk/commit/903eea6bfb8ee405587f0866a1d1e92eea45d29e
+      #   # has landed in dev channel.
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change && matrix.os != 'windows' }}
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
       - run: dart --enable-experiment=native-assets run
         working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/
@@ -189,17 +99,20 @@ jobs:
         working-directory: pkgs/${{ matrix.package }}/example/build/native_add_app/bin/native_add_app/
         if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/use_dart_api/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/download_asset/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
-
-      - run: dart --enable-experiment=native-assets test
-        working-directory: pkgs/${{ matrix.package }}/example/build/system_library/
-        if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/download_asset/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
+
+      # TODO(https://github.com/dart-lang/sdk/issues/60489): Fix `dart test` with workspaces
+      # - run: dart --enable-experiment=native-assets test
+      #   working-directory: pkgs/${{ matrix.package }}/example/build/system_library/
+      #   if: ${{ matrix.package == 'native_assets_cli' && matrix.sdk == 'dev' && !matrix.breaking-change }}
 
       - name: Install coverage
         run: dart pub global activate coverage

diff --git a/pkgs/code_assets/pubspec.yaml b/pkgs/code_assets/pubspec.yaml
@@ -8,6 +8,8 @@ description: >-
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/data_assets/pubspec.yaml b/pkgs/data_assets/pubspec.yaml
@@ -8,6 +8,8 @@ description: >-
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/hooks/pubspec.yaml b/pkgs/hooks/pubspec.yaml
@@ -4,6 +4,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/hooks
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/json_syntax_generator/pubspec.yaml b/pkgs/json_syntax_generator/pubspec.yaml
@@ -9,6 +9,8 @@ description: |
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/pubspec.yaml b/pkgs/native_assets_builder/pubspec.yaml
@@ -6,6 +6,8 @@ repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_bui
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test/helpers.dart b/pkgs/native_assets_builder/test/helpers.dart
@@ -278,10 +278,12 @@ Future<void> copyTestProjects({Uri? sourceUri, required Uri targetUri}) async {
     final sourceFile = File.fromUri(sourceUri.resolveUri(pathToModify));
     final targetFileUri = targetUri.resolveUri(pathToModify);
     final sourceString = await sourceFile.readAsString();
-    final modifiedString = sourceString.replaceAll(
-      'path: ../../',
-      'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}',
-    );
+    final modifiedString = sourceString
+        .replaceAll(
+          'path: ../../',
+          'path: ${pkgNativeAssetsBuilderUri.toFilePath().unescape()}',
+        )
+        .replaceAll('resolution: workspace', '');
     await File.fromUri(
       targetFileUri,
     ).writeAsString(modifiedString, flush: true);

diff --git a/pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/add_asset_link/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/complex_link/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml b/pkgs/native_assets_builder/test_data/complex_link_helper/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml b/pkgs/native_assets_builder/test_data/cyclic_package_1/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml b/pkgs/native_assets_builder/test_data/cyclic_package_2/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/dart_app/pubspec.yaml b/pkgs/native_assets_builder/test_data/dart_app/pubspec.yaml
@@ -2,6 +2,8 @@ name: dart_app
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml b/pkgs/native_assets_builder/test_data/depend_on_fail_build/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml b/pkgs/native_assets_builder/test_data/depend_on_fail_build_app/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/drop_dylib_link/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_build/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml b/pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/manifest_generator.dart b/pkgs/native_assets_builder/test_data/manifest_generator.dart
@@ -20,6 +20,10 @@ const denyList = [
 ];
 
 /// These just modify other test projects.
+///
+/// Don't add pubspecs to manifests, they contain a different name due to all
+/// being part of a big workspace. They have a pubspec to enable analysis of
+/// the Dart code in them.
 const partialProjects = [
   'native_add_add_source',
   'native_add_add_symbol',
@@ -42,9 +46,13 @@ void updateManifest(Directory directory, bool allowPartialProjects) {
             for (final denyString in [
               ...denyList,
               if (!allowPartialProjects) ...partialProjects,
+              for (final partialProject in partialProjects) ...[
+                '$partialProject/pubspec.yaml',
+              ],
             ]) {
               if (f.path.contains(denyString)) return false;
             }
+
             return true;
           })
           .map((e) => e.path.replaceFirst(dirPath, ''))

diff --git a/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_add/pubspec.yaml
@@ -4,6 +4,8 @@ version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'
 

diff --git a/pkgs/native_assets_builder/test_data/native_add_add_source/manifest.yaml b/pkgs/native_assets_builder/test_data/native_add_add_source/manifest.yaml
@@ -2,6 +2,5 @@
 # a completely clean setup.
 # Automatically generated by manifest_generator.dart.
 - hook/build.dart
-- pubspec.yaml
 - src/native_multiply.c
 - src/native_multiply.h
diff --git a/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml b/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec.yaml
@@ -1,9 +1,11 @@
-name: native_add
+name: native_add_source
 description: Sums two numbers with native code.
 version: 0.1.0
 
 publish_to: none
 
+resolution: workspace
+
 environment:
   sdk: '>=3.7.0 <4.0.0'