Remove reference to concrete native host app #16803
Conversation
ghost
added
the
|
Hey there @dansiegel! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
There was a problem hiding this comment.
D:\a_work\1\s\src\Core\src\Platform\Tizen\CoreAppExtensions.cs(12,27): error CS8602: Dereference of a possibly null reference. [D:\a_work\1\s\src\Core\src\Core.csproj::TargetFramework=net7.0-tizen]
D:\a_work\1\s\src\Core\src\Platform\Tizen\CoreAppExtensions.cs(26,27): error CS8602: Dereference of a possibly null reference. [D:\a_work\1\s\src\Core\src\Core.csproj::TargetFramework=net7.0-tizen]
|
sorry took me a bit longer than expected to get the time to circle back to this... updated and should be building now |
|
Looking good! |
|
/azp run MAUI-DeviceTests-public |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/backport to release/8.0.1xx-rc2.1 |
|
Started backporting to release/8.0.1xx-rc2.1: https://github.com/dotnet/maui/actions/runs/6628835050 |
|
@PureWeen backporting to release/8.0.1xx-rc2.1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: fix: remove reference to concrete native host app
Using index info to reconstruct a base tree...
M src/Compatibility/ControlGallery/src/Android/Issue10182Activity.cs
M src/Compatibility/Core/src/AppHostBuilderExtensions.Android.cs
M src/Compatibility/Core/src/AppHostBuilderExtensions.Tizen.cs
M src/Compatibility/Core/src/AppHostBuilderExtensions.cs
M src/Compatibility/Core/src/AppHostBuilderExtensions.iOS.cs
M src/Core/src/Hosting/EssentialsMauiAppBuilderExtensions.cs
M src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs
M src/Core/src/Platform/Android/MauiAppCompatActivity.cs
M src/Core/src/Platform/Tizen/CoreAppExtensions.cs
M src/Core/src/Platform/iOS/MauiContextExtensions.cs
M src/Core/src/Platform/iOS/MauiUISceneDelegate.cs
M src/Core/src/Platform/iOS/UIApplicationExtensions.cs
M src/TestUtils/src/DeviceTests.Runners/TestServices.cs
Falling back to patching base and 3-way merge...
Auto-merging src/TestUtils/src/DeviceTests.Runners/TestServices.cs
CONFLICT (content): Merge conflict in src/TestUtils/src/DeviceTests.Runners/TestServices.cs
Auto-merging src/Core/src/Platform/Tizen/CoreAppExtensions.cs
CONFLICT (content): Merge conflict in src/Core/src/Platform/Tizen/CoreAppExtensions.cs
Auto-merging src/Core/src/Hosting/EssentialsMauiAppBuilderExtensions.cs
CONFLICT (content): Merge conflict in src/Core/src/Hosting/EssentialsMauiAppBuilderExtensions.cs
Auto-merging src/Compatibility/Core/src/AppHostBuilderExtensions.cs
CONFLICT (content): Merge conflict in src/Compatibility/Core/src/AppHostBuilderExtensions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: remove reference to concrete native host app
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@PureWeen an error occurred while backporting to release/8.0.1xx-rc2.1, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Description of Change
Removes references to concrete native host apps in favor of using
IPlatformApplication.Currentas this properly supports embedding scenarios.Issues Fixed
Fixes #16759
I've added a TODO for Maui Essentials to find a better way to address the reference to MauiApplication.Current for the native Android Application.