Fix conflicts and build failures in inflight/current branch#34495
Merged
kubaflo merged 1 commit intodotnet:inflight/currentfrom Mar 16, 2026
Merged
Fix conflicts and build failures in inflight/current branch#34495kubaflo merged 1 commit intodotnet:inflight/currentfrom
kubaflo merged 1 commit intodotnet:inflight/currentfrom
Conversation
kubaflo
approved these changes
Mar 16, 2026
PureWeen
pushed a commit
that referenced
this pull request
Mar 19, 2026
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- Enter description of the fix in this section --> The fix in PR #34382 , currently in the inflight/current branch, causes conflicts in ItemsFactory2.cs and build failed. Issues [34165](#34165) and [17799](#17799) were already resolved by PR #31215 , which is also included in the inflight/current branch. Therefore, removing the PR #34382 changes from inflight/current to resolve the conflicts in ItemsFactory2.cs.
PureWeen
pushed a commit
that referenced
this pull request
Mar 24, 2026
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- Enter description of the fix in this section --> The fix in PR #34382 , currently in the inflight/current branch, causes conflicts in ItemsFactory2.cs and build failed. Issues [34165](#34165) and [17799](#17799) were already resolved by PR #31215 , which is also included in the inflight/current branch. Therefore, removing the PR #34382 changes from inflight/current to resolve the conflicts in ItemsFactory2.cs.
KarthikRajaKalaimani
pushed a commit
to KarthikRajaKalaimani/maui
that referenced
this pull request
Mar 30, 2026
…4495) <!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- Enter description of the fix in this section --> The fix in PR dotnet#34382 , currently in the inflight/current branch, causes conflicts in ItemsFactory2.cs and build failed. Issues [34165](dotnet#34165) and [17799](dotnet#17799) were already resolved by PR dotnet#31215 , which is also included in the inflight/current branch. Therefore, removing the PR dotnet#34382 changes from inflight/current to resolve the conflicts in ItemsFactory2.cs.
sheiksyedm
pushed a commit
that referenced
this pull request
Apr 4, 2026
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- Enter description of the fix in this section --> The fix in PR #34382 , currently in the inflight/current branch, causes conflicts in ItemsFactory2.cs and build failed. Issues [34165](#34165) and [17799](#17799) were already resolved by PR #31215 , which is also included in the inflight/current branch. Therefore, removing the PR #34382 changes from inflight/current to resolve the conflicts in ItemsFactory2.cs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Change
The fix in PR #34382 , currently in the inflight/current branch, causes conflicts in ItemsFactory2.cs and build failed. Issues 34165 and 17799 were already resolved by PR #31215 , which is also included in the inflight/current branch. Therefore, removing the PR #34382 changes from inflight/current to resolve the conflicts in ItemsFactory2.cs.