xamarin-macios
xamarin-macios copied to clipboard
[msbuild] Add support for bundling original resources in libraries. Fixes #19028.
If a library references resources, until now we've pre-compile/pre-processed some of those before embedding them the library. This applies to resources of the following item groups:
- AtlasTexture
- BundleResource
- Collada
- CoreMLModel
- ImageAsset
- InterfaceDefinition
- SceneKitAsset
However, pre-processing resources as a few problems:
- It requires a native (Xcode) toolchain.
- This is unfortunate when building from Windows: the current approach is that when building a library as a referenced project, the remoting part is skipped, so all such resources are just dropped.
- It also means building on Linux doesn't work.
- It makes it impossible to merge resources with the same name, if we wanted to do that.
So I'm adding support for bundling the original resources in library projects.
This is enabled using the MSBuild property BundleOriginalResources=true,
which is turned off by default for .NET 8 and turned on by default for .NET 9+.
Additionally I've added PartialAppManifest items to the list of bundled
resources from class libraries.
Fixes https://github.com/xamarin/xamarin-macios/issues/19028.
:books: [CI Build] Artifacts :books:
Packages generated
View packages
Pipeline on Agent Hash: [PR build]
:computer: [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed :computer:
:white_check_mark: All tests on macOS X64 - Mac Sonoma (14) passed.
Pipeline on Agent Hash: 78c90ffb6d26cc0beb7d6eec3d66409ce0a92d72 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Big Sur (11) passed.
Pipeline on Agent Hash: 78c90ffb6d26cc0beb7d6eec3d66409ce0a92d72 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Monterey (12) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Monterey (12) passed.
Pipeline on Agent Hash: 78c90ffb6d26cc0beb7d6eec3d66409ce0a92d72 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Ventura (13) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Ventura (13) passed.
Pipeline on Agent Hash: 78c90ffb6d26cc0beb7d6eec3d66409ce0a92d72 [PR build]
:x: [CI Build] Windows Integration Tests failed :x:
:x: Failed :x:
Pipeline on Agent Hash: 78c90ffb6d26cc0beb7d6eec3d66409ce0a92d72 [PR build]
:white_check_mark: API diff for current PR / commit
Legacy Xamarin (No breaking changes)
- ~iOS~ (no change detected)
- ~tvOS~ (no change detected)
- ~watchOS~ (no change detected)
- ~macOS~ (no change detected)
NET (empty diffs)
- ~iOS~: (empty diff detected)
- ~tvOS~: (empty diff detected)
- ~MacCatalyst~: (empty diff detected)
- ~macOS~: (empty diff detected)
:white_check_mark: API diff vs stable
Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
:information_source: Generator diff
Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)
Pipeline on Agent Hash: 78c90ffb6d26cc0beb7d6eec3d66409ce0a92d72 [PR build]
:books: [CI Build] Artifacts :books:
Packages generated
View packages
Pipeline on Agent Hash: [PR build]
:computer: [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed :computer:
:white_check_mark: All tests on macOS X64 - Mac Sonoma (14) passed.
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Ventura (13) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Ventura (13) passed.
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Big Sur (11) passed.
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Monterey (12) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Monterey (12) passed.
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:fire: [CI Build] Test results :fire:
Test results
:x: Tests failed on VSTS: test results
3 tests crashed, 6 tests failed, 149 tests passed.
Failures
:x: dotnettests tests (iOS)
- DotNet tests: BuildFailure
Html Report (VSDrops) Download
:x: dotnettests tests (MacCatalyst)
- DotNet tests: BuildFailure
Html Report (VSDrops) Download
:x: dotnettests tests (macOS)
- DotNet tests: BuildFailure
Html Report (VSDrops) Download
:x: dotnettests tests (Multiple platforms)
- DotNet tests: BuildFailure
Html Report (VSDrops) Download
:x: dotnettests tests (tvOS)
- DotNet tests: BuildFailure
Html Report (VSDrops) Download
:x: linker tests
- link all/tvOS - simulator/Debug [dotnet]: Crashed
Html Report (VSDrops) Download
:x: msbuild tests
:fire: Failed catastrophically on VSTS: test results - msbuild (no summary found).
Html Report (VSDrops) Download
:x: xammac tests
:fire: Failed catastrophically on VSTS: test results - xammac (no summary found).
Html Report (VSDrops) Download
:x: xcframework tests
:fire: Failed catastrophically on VSTS: test results - xcframework (no summary found).
Html Report (VSDrops) Download
Successes
:white_check_mark: cecil: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: framework: All 6 tests passed. Html Report (VSDrops) Download :white_check_mark: fsharp: All 7 tests passed. Html Report (VSDrops) Download :white_check_mark: generator: All 2 tests passed. Html Report (VSDrops) Download :white_check_mark: install-source: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: interdependent-binding-projects: All 7 tests passed. Html Report (VSDrops) Download :white_check_mark: introspection: All 8 tests passed. Html Report (VSDrops) Download :white_check_mark: mac-binding-project: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: mmp: All 2 tests passed. Html Report (VSDrops) Download :white_check_mark: mononative: All 6 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (MacCatalyst): All 7 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (macOS): All 8 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (watchOS): All 4 tests passed. Html Report (VSDrops) Download :white_check_mark: mtouch: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: xtro: All 2 tests passed. Html Report (VSDrops) Download
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:x: [CI Build] Windows Integration Tests failed :x:
:x: Failed :x:
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:white_check_mark: API diff for current PR / commit
Legacy Xamarin (No breaking changes)
- ~iOS~ (no change detected)
- ~tvOS~ (no change detected)
- ~watchOS~ (no change detected)
- ~macOS~ (no change detected)
NET (empty diffs)
- ~iOS~: (empty diff detected)
- ~tvOS~: (empty diff detected)
- ~MacCatalyst~: (empty diff detected)
- ~macOS~: (empty diff detected)
:white_check_mark: API diff vs stable
Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
:information_source: Generator diff
Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:fire: [CI Build] Test results :fire:
Test results
:x: Tests failed on VSTS: test results
0 tests crashed, 1 tests failed, 167 tests passed.
Failures
:x: monotouch tests (watchOS)
- monotouch-test/watchOS 32-bits - simulator/Release (all optimizations): TimedOut
Html Report (VSDrops) Download
Successes
:white_check_mark: cecil: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: framework: All 6 tests passed. Html Report (VSDrops) Download :white_check_mark: fsharp: All 7 tests passed. Html Report (VSDrops) Download :white_check_mark: generator: All 2 tests passed. Html Report (VSDrops) Download :white_check_mark: install-source: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: interdependent-binding-projects: All 7 tests passed. Html Report (VSDrops) Download :white_check_mark: introspection: All 8 tests passed. Html Report (VSDrops) Download :white_check_mark: linker: All 65 tests passed. Html Report (VSDrops) Download :white_check_mark: mac-binding-project: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: mmp: All 2 tests passed. Html Report (VSDrops) Download :white_check_mark: mononative: All 6 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (MacCatalyst): All 7 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (macOS): All 8 tests passed. Html Report (VSDrops) Download :white_check_mark: monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download :white_check_mark: msbuild: All 2 tests passed. Html Report (VSDrops) Download :white_check_mark: mtouch: All 1 tests passed. Html Report (VSDrops) Download :white_check_mark: xammac: All 3 tests passed. Html Report (VSDrops) Download :white_check_mark: xcframework: All 8 tests passed. Html Report (VSDrops) Download :white_check_mark: xtro: All 2 tests passed. Html Report (VSDrops) Download
Pipeline on Agent Hash: edf0ac6748a7f0a25029dc193cc7dcb6323ce98a [PR build]
:fire: Failed to compare API and create generator diff :fire:
Failed to update apidiff references
Pipeline on Agent Hash: 12a0e0b9e450fff2663257259238e3212d6c884d [PR build]
:books: [CI Build] Artifacts :books:
Packages generated
View packages
Pipeline on Agent Hash: [PR build]
:computer: [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed :computer:
:white_check_mark: All tests on macOS X64 - Mac Sonoma (14) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:computer: [CI Build] Tests on macOS X64 - Mac Sonoma (14) passed :computer:
:white_check_mark: All tests on macOS X64 - Mac Sonoma (14) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:books: [CI Build] Artifacts :books:
Artifacts were not provided.
Pipeline on Agent Hash: [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Monterey (12) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Monterey (12) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Ventura (13) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Ventura (13) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Ventura (13) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Ventura (13) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Big Sur (11) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Big Sur (11) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Big Sur (11) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:computer: [CI Build] Tests on macOS M1 - Mac Monterey (12) passed :computer:
:white_check_mark: All tests on macOS M1 - Mac Monterey (12) passed.
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:x: [CI Build] Windows Integration Tests failed :x:
:x: Failed :x:
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:x: [CI Build] Windows Integration Tests failed :x:
:x: Failed :x:
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]
:white_check_mark: API diff for current PR / commit
NET (empty diffs)
- ~iOS~: (empty diff detected)
- ~tvOS~: (empty diff detected)
- ~MacCatalyst~: (empty diff detected)
- ~macOS~: (empty diff detected)
:white_check_mark: API diff vs stable
.NET (No breaking changes)
:information_source: Generator diff
Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)
Pipeline on Agent Hash: 565e45f2106a0ed4de0aef05694201c7bc909473 [PR build]