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

Update intellisense package version to RC2 #42220

Merged
merged 2 commits into from
Sep 24, 2020

Conversation

safern
Copy link
Member

@safern safern commented Sep 14, 2020

@Dotnet-GitSync-Bot
Copy link
Collaborator

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@safern
Copy link
Member Author

safern commented Sep 14, 2020

/backport to release/5.0-rc2

@github-actions
Copy link
Contributor

Started backporting to release/5.0-rc2: https://github.com/dotnet/runtime/actions/runs/254597501

@safern safern added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 15, 2020
@safern
Copy link
Member Author

safern commented Sep 15, 2020

We're going to hold this PR in case we need one more update for the intellisense package and merge on the 28th.

eng/Versions.props Outdated Show resolved Hide resolved
Co-authored-by: Carlos Sanchez <[email protected]>
@safern safern removed the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Sep 24, 2020
@safern
Copy link
Member Author

safern commented Sep 24, 2020

/backport to release/5.0-rc2

@github-actions
Copy link
Contributor

Started backporting to release/5.0-rc2: https://github.com/dotnet/runtime/actions/runs/270043462

@github-actions
Copy link
Contributor

@safern backporting to release/5.0-rc2 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Update intellisense package version to RC2
error: sha1 information is lacking or useless (eng/Versions.props).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update intellisense package version to RC2
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@safern safern merged commit 42d3314 into dotnet:master Sep 24, 2020
@safern safern deleted the UpdateIntellisenseRc2 branch September 24, 2020 13:54
@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants