Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jun 2, 2025

Backport of #27183 to main

/cc @mattleibow

@github-actions github-actions bot requested a review from a team as a code owner June 2, 2025 18:14
@github-actions github-actions bot requested review from PureWeen and tj-devel709 June 2, 2025 18:14
@mattleibow
Copy link
Member

/backport to net10.0

@github-actions
Copy link
Contributor Author

github-actions bot commented Jun 2, 2025

Started backporting to net10.0: https://github.com/dotnet/maui/actions/runs/15399723292

@github-actions
Copy link
Contributor Author

github-actions bot commented Jun 2, 2025

@mattleibow backporting to "net10.0" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Convert HybridWebView.js to TypeScript and embed
.git/rebase-apply/patch:584: trailing whitespace.
 * This file contains the JavaScript code that the HybridWebView control uses to 
.git/rebase-apply/patch:586: trailing whitespace.
 * 
.git/rebase-apply/patch:750: trailing whitespace.
         * 
.git/rebase-apply/patch:760: trailing whitespace.
         * 
.git/rebase-apply/patch:763: trailing whitespace.
         * 
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	Directory.Build.targets
M	src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
M	src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
M	src/Core/src/Core.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Core.csproj
Removing src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/scripts/HybridWebView.js
Auto-merging src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
Removing src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/scripts/HybridWebView.js
Auto-merging src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
Auto-merging Directory.Build.targets
CONFLICT (content): Merge conflict in Directory.Build.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Convert HybridWebView.js to TypeScript and embed
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@mattleibow mattleibow closed this Jun 2, 2025
@mattleibow mattleibow deleted the backport/pr-27183-to-main branch June 2, 2025 18:20
@github-actions github-actions bot locked and limited conversation to collaborators Jul 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants