Skip to content
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

fix: Pack add-ins discovery targets with the dev-server (backport #19464) #19473

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 7, 2025

linked to unoplatform/studio#43 (comment)

Bugfix

Pack add-ins discovery targets with the dev-server to be able to run them no matter the SDK sued by the project

What is the current behavior?

If a project uses the Microsoft.NET.Sdk the add-ins discovery might fail.

What is the new behavior?

Targets are dynamically injected, no matter the SDK

PR Checklist


This is an automatic backport of pull request #19464 done by [Mergify](https://mergify.com).

… run them no matter the SDK sued by the project

(cherry picked from commit 36a0d9b)

# Conflicts:
#	src/Uno.Sdk/targets/Uno.Build.targets
(cherry picked from commit f980d05)

# Conflicts:
#	src/Uno.Sdk/targets/Uno.Build.targets
Copy link
Contributor Author

mergify bot commented Feb 7, 2025

Cherry-pick of 36a0d9b has failed:

On branch mergify/bp/release/stable/5.6/pr-19464
Your branch is up to date with 'origin/release/stable/5.6'.

You are currently cherry-picking commit 36a0d9b107.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   src/Uno.UI.RemoteControl.Host/DevServer.Custom.Targets
	modified:   src/Uno.UI.RemoteControl.Host/Extensibility/AddIns.cs
	modified:   src/Uno.UI.RemoteControl.Server.Processors/Helpers/ProcessHelper.cs
	modified:   src/Uno.UI.RemoteControl/buildTransitive/Uno.WinUI.DevServer.targets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Sdk/targets/Uno.Build.targets

Cherry-pick of f980d05 has failed:

On branch mergify/bp/release/stable/5.6/pr-19464
Your branch is ahead of 'origin/release/stable/5.6' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f980d05414.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/Uno.UI.RemoteControl.Host/DevServer.Custom.Targets
	modified:   src/Uno.UI.RemoteControl.Host/Extensibility/AddIns.cs
	modified:   src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj
	modified:   src/Uno.UI.RemoteControl/buildTransitive/Uno.WinUI.DevServer.targets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Sdk/targets/Uno.Build.targets

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@dr1rrb dr1rrb self-requested a review February 7, 2025 13:58
src/Uno.Sdk/targets/Uno.Build.targets Outdated Show resolved Hide resolved
src/Uno.Sdk/targets/Uno.Build.targets Outdated Show resolved Hide resolved
src/Uno.Sdk/targets/Uno.Build.targets Outdated Show resolved Hide resolved
@jeromelaban jeromelaban merged commit 3fa13b0 into release/stable/5.6 Feb 7, 2025
12 of 18 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.6/pr-19464 branch February 7, 2025 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants