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: Adjust for IntermediateOutputPath requiring a sub-path of the current project (backport #649) #651

Closed

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 15, 2022

This is an automatic backport of pull request #649 done by Mergify.
Cherry-pick of 9e0ba03 has failed:

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

You are currently cherry-picking commit 9e0ba03.
  (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.Wasm.Bootstrap-netcore-only.slnf
	new file:   src/Uno.Wasm.Tests.AbsoluteIntermediate/Directory.Build.props
	new file:   src/Uno.Wasm.Tests.AbsoluteIntermediate/Program.cs
	new file:   src/Uno.Wasm.Tests.AbsoluteIntermediate/Uno.Wasm.Tests.AbsoluteIntermediate.csproj

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Wasm.Bootstrap.sln

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 9e0ba03)

# Conflicts:
#	src/Uno.Wasm.Bootstrap.sln
@jeromelaban jeromelaban closed this May 9, 2023
@mergify mergify bot deleted the mergify/bp/release/stable/7.0/pr-649 branch May 9, 2023 13:38
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.

1 participant