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

Bump intellisense to include latest docs for RC2 #76846

Merged
merged 1 commit into from
Oct 11, 2022

Conversation

carlossanlop
Copy link
Member

@carlossanlop carlossanlop commented Oct 10, 2022

Includes the most recent PRs we merged in dotnet-api-docs using the ref assemblies for RC2.

The package was generated in this job: https://apidrop.visualstudio.com/Content%20CI/_build/results?buildId=324379&view=logs&j=fd490c07-0b22-5182-fac9-6d67fe1e939b&t=11e7ea89-affe-5194-cdc6-0171c3394706
The full name is Microsoft.Private.Intellisense.7.0.0-preview-20221010.1.nupkg

Will backport this to 7.0 to include in GA.

@ghost
Copy link

ghost commented Oct 10, 2022

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

Includes the most recent PRs we merged in dotnet-api-docs.
The package was generated in this job: https://apidrop.visualstudio.com/Content%20CI/_build/results?buildId=324379&view=logs&j=fd490c07-0b22-5182-fac9-6d67fe1e939b&t=11e7ea89-affe-5194-cdc6-0171c3394706
The full name is Microsoft.Private.Intellisense.7.0.0-preview-20221010.1.nupkg

Will backport this to 7.0.

Author: carlossanlop
Assignees: carlossanlop
Labels:

area-Infrastructure-libraries

Milestone: -

@carlossanlop
Copy link
Member Author

/backport to release/7.0

@github-actions
Copy link
Contributor

@github-actions
Copy link
Contributor

@carlossanlop backporting to release/7.0 failed, the patch most likely resulted in conflicts:

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

Applying: Bump intellisense to include latest docs for GA
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump intellisense to include latest docs for GA
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!

@carlossanlop carlossanlop changed the title Bump intellisense to include latest docs for GA Bump intellisense to include latest docs for RC2 Oct 10, 2022
@build-analysis build-analysis bot mentioned this pull request Oct 11, 2022
2 tasks
@carlossanlop
Copy link
Member Author

CI failures unrelated.

@carlossanlop carlossanlop merged commit e28cbae into dotnet:main Oct 11, 2022
@carlossanlop carlossanlop deleted the BumpIntellisense branch October 11, 2022 22:45
@ghost ghost locked as resolved and limited conversation to collaborators Nov 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants