Skip to content

Conversation

@carlossanlop
Copy link
Contributor

Updating to consume the nuget package with the last batch of docs from dotnet-api-docs for RC2. https://dnceng.visualstudio.com/public/_artifacts/feed/dotnet9-transport/NuGet/Microsoft.Private.Intellisense/overview/9.0.0-preview-20241010.1

Already updated source build dotnet/source-build-reference-packages#1055

Need to backport to release/9.0 (also updated source build in that branch: dotnet/source-build-reference-packages#1056)

@carlossanlop carlossanlop added documentation Documentation bug or enhancement, does not impact product or test code area-Infrastructure-libraries labels Oct 10, 2024
@carlossanlop carlossanlop requested review from a team, directhex and ericstj October 10, 2024 20:29
@carlossanlop carlossanlop self-assigned this Oct 10, 2024
@carlossanlop
Copy link
Contributor Author

/backport to release/9.0

@github-actions
Copy link
Contributor

@dotnet-policy-service
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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

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

Applying: Bump Microsoft.Private.Intellisense to 20241010.1
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
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump Microsoft.Private.Intellisense to 20241010.1
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@carlossanlop an error occurred while backporting to release/9.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@carlossanlop
Copy link
Contributor Author

Blocked by dotnet/source-build-reference-packages#1055 as it needs to flow to runtime first.

@carlossanlop
Copy link
Contributor Author

/azp run runtime-dev-innerloop

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@carlossanlop
Copy link
Contributor Author

@dotnet/runtime-infrastructure @dotnet/area-infrastructure-libraries can I get a sign-off?

@carlossanlop carlossanlop merged commit 0783785 into dotnet:main Oct 14, 2024
151 of 155 checks passed
@carlossanlop carlossanlop deleted the BumpIntellisense branch October 14, 2024 21:00
@github-actions github-actions bot locked and limited conversation to collaborators Nov 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Infrastructure-libraries blocked Issue/PR is blocked on something - see comments documentation Documentation bug or enhancement, does not impact product or test code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants