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: Ensure that Platform is specified by default in Release (backport #16720) #16737

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 15, 2024

GitHub Issue (If applicable): related to #16662

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

Building with no Platform set will use the current OS platform.

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):


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

(cherry picked from commit ce755d4)

# Conflicts:
#	build/test-scripts/run-netcore-mobile-template-tests.ps1
@mergify mergify bot added the conflicts label May 15, 2024
Copy link
Contributor Author

mergify bot commented May 15, 2024

Cherry-pick of ce755d4 has failed:

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

You are currently cherry-picking commit ce755d4039.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   build/test-scripts/run-netcore-mobile-template-tests.ps1

no changes added to commit (use "git add" and/or "git commit -a")

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

@github-actions github-actions bot added the area/build Categorizes an issue or PR as relevant to build infrastructure label May 15, 2024
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-16737/index.html

@github-actions github-actions bot removed the area/build Categorizes an issue or PR as relevant to build infrastructure label May 15, 2024
@jeromelaban jeromelaban merged commit a7b82e3 into release/stable/5.2 May 15, 2024
16 of 30 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.2/pr-16720 branch May 15, 2024 13:24
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.

None yet

2 participants