Skip to content

Fix conflicts and build failures in inflight/current branch#34495

Merged
kubaflo merged 1 commit intodotnet:inflight/currentfrom
devanathan-vaithiyanathan:revert-34382
Mar 16, 2026
Merged

Fix conflicts and build failures in inflight/current branch#34495
kubaflo merged 1 commit intodotnet:inflight/currentfrom
devanathan-vaithiyanathan:revert-34382

Conversation

@devanathan-vaithiyanathan
Copy link
Copy Markdown
Contributor

@devanathan-vaithiyanathan devanathan-vaithiyanathan commented Mar 16, 2026

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.

@dotnet-policy-service dotnet-policy-service bot added the partner/syncfusion Issues / PR's with Syncfusion collaboration label Mar 16, 2026
@sheiksyedm sheiksyedm marked this pull request as ready for review March 16, 2026 13:54
@sheiksyedm sheiksyedm added the community ✨ Community Contribution label Mar 16, 2026
@sheiksyedm sheiksyedm changed the title Fix conflicts in inflight/current branch Fix conflicts and build failures in inflight/current branch Mar 16, 2026
@kubaflo kubaflo merged commit 7d6d525 into dotnet:inflight/current Mar 16, 2026
2 of 11 checks passed
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

community ✨ Community Contribution partner/syncfusion Issues / PR's with Syncfusion collaboration

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants