-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[net8.0] Update dependencies from xamarin/xamarin-android #16024
[net8.0] Update dependencies from xamarin/xamarin-android #16024
Conversation
…uild main-47087d5604645103786ff19b39dd04474d05dd0b-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.362
…uild main-a850d8147d6c1d066f3849e7cf8fab231497c64b-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.365 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.100-preview.7.23325.5 -> To Version 8.0.100-preview.7.23330.16 (parent: Microsoft.Android.Sdk.Windows
…uild main-f21e10deed466c71713e1b35dbc8a327880c2c7c-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.367 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.100-preview.7.23325.5 -> To Version 8.0.100-preview.7.23330.16 (parent: Microsoft.Android.Sdk.Windows
…uild main-76ab8b2ca208a73834c70453193e5ec7ef1f7304-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.369 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.100-preview.7.23325.5 -> To Version 8.0.100-preview.7.23330.16 (parent: Microsoft.Android.Sdk.Windows
…uild main-a016b31a88a78bc67a8a33edeabbf92a4dc28c71-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.371 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.100-preview.7.23325.5 -> To Version 8.0.100-preview.7.23330.16 (parent: Microsoft.Android.Sdk.Windows
…uild main-26ffd5d763b36dde528bc324967f4925e9101733-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.374 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.100-preview.7.23325.5 -> To Version 8.0.100-preview.7.23330.16 (parent: Microsoft.Android.Sdk.Windows
|
I think the latest error is caused by: dotnet/android@26ffd5d It adds
We should be passing |
Context: dotnet/maui#16024 (comment) .NET MAUI's build currently fails with: Xamarin.Android.Aapt2.targets(123,3): error APT2144: invalid file path 'D:\a\_work\1\s\src\Core\src\obj\Debug\net8.0-android\lp\129.stamp'. What is very wrong about this, it is trying to `aapt2 compile` a `*.stamp` file: Executing compile -o /Users/builder/azdo/_work/1/s/src/Core/src/obj/Release/net8.0-android/lp/87/jl/res/../flat/ /Users/builder/azdo/_work/1/s/src/Core/src/obj/Release/net8.0-android/lp/87.stamp Normally this runs against `*.flat` or `*.flata` files. This problem was introduced in 26ffd5d: 1. Library A uses an AndroidX package, the AndroidX `.aar` file is added to `@(AndroidAarLibrary)`. The NuGet package does this in a `.targets` file. 2. With the change in 26ffd5d, the `.aar` is copied to Library A's build output. 3. Library B uses the same AndroidX package and references Library A. 4. Library B now has duplicate `.aar` files & has the weird build error! I could reproduce the issue in a test. There *may* be a second bug here, but we should update our logic to be: <!-- .aar files should be copied to $(OutputPath) in .NET 6--> <None Include="@(AndroidLibrary)" Condition=" '%(AndroidLibrary.Extension)' == '.aar' " ... /> <!-- @(LibraryProjectZip) items that are not in @(AndroidLibrary) --> <None Include="@(LibraryProjectZip)" Exclude="@(AndroidLibrary)" ... /> So we now only copy: * The new `@(AndroidLibrary)` item group with an `.aar` extension. *Not* `@(AndroidAarLibrary)`. * Any `@(LibraryProjectZip)` that are *not* in `@(AndroidLibrary)`. This supports the classic item group name, keeping our behavior before. Now the new test and the test updated in 26ffd5d both pass.
Context: dotnet/maui#16024 (comment) .NET MAUI's build currently fails with: Xamarin.Android.Aapt2.targets(123,3): error APT2144: invalid file path 'D:\a\_work\1\s\src\Core\src\obj\Debug\net8.0-android\lp\129.stamp'. What is very wrong about this, it is trying to `aapt2 compile` a `*.stamp` file: Executing compile -o /Users/builder/azdo/_work/1/s/src/Core/src/obj/Release/net8.0-android/lp/87/jl/res/../flat/ /Users/builder/azdo/_work/1/s/src/Core/src/obj/Release/net8.0-android/lp/87.stamp Normally this runs against `*.flat` or `*.flata` files. This problem was introduced in 26ffd5d: 1. Library A uses an AndroidX package, the AndroidX `.aar` file is added to `@(AndroidAarLibrary)`. The NuGet package does this in a `.targets` file. 2. With the change in 26ffd5d, the `.aar` is copied to Library A's build output. 3. Library B uses the same AndroidX package and references Library A. 4. Library B now has duplicate `.aar` files & has the weird build error! I could reproduce the issue in a test. There *may* be a second bug here, but we should update our logic to be: <!-- .aar files should be copied to $(OutputPath) in .NET 6--> <None Include="@(AndroidLibrary)" Condition=" '%(AndroidLibrary.Extension)' == '.aar' " ... /> <!-- @(LibraryProjectZip) items that are not in @(AndroidLibrary) --> <None Include="@(LibraryProjectZip)" Exclude="@(AndroidLibrary)" ... /> So we now only copy: * The new `@(AndroidLibrary)` item group with an `.aar` extension. *Not* `@(AndroidAarLibrary)`. * Any `@(LibraryProjectZip)` that are *not* in `@(AndroidLibrary)`. This supports the classic item group name, keeping our behavior before. Now the new test and the test updated in 26ffd5d both pass.
…uild main-3a89e8d87afe1fa68744b0cf427d748dd42db51a-1 Microsoft.Android.Sdk.Windows From Version 34.0.0-preview.7.361 -> To Version 34.0.0-preview.7.376 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.100-preview.7.23325.5 -> To Version 8.0.100-preview.7.23330.16 (parent: Microsoft.Android.Sdk.Windows
We should try hard to merge this one today. I just merged a .NET bump where a lot of things broke: I suspect you're going to have to do some work to fix the MAUI build for the next one... |
yeah that why I wanted also net8.0 green. so we could merge easier . I m on it |
This pull request updates the following dependencies
From https://github.com/xamarin/xamarin-android
Coherency Updates
The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format