sync main with patches in releases/core#505
Open
singhk97 wants to merge 2 commits into
Open
Conversation
singhk97
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR cherry-picks versioning and publishing pipeline tweaks from releases/core onto main to keep branch behavior aligned—specifically around Nerdbank.GitVersioning height offsets and internal feed publishing tolerance for 409 conflicts.
Changes:
- Adjusts
versionHeightOffsetvalues in NBGVversion.jsonfiles to change computed package versions/heights. - Updates the internal NuGet push step to tolerate package conflict (409) responses by setting
allowPackageConflicts: true.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
core/version.json |
Changes the core-wide NBGV versionHeightOffset (affects generated versions across core). |
core/src/Microsoft.Teams.Apps/version.json |
Adds/sets an NBGV versionHeightOffset specifically for Microsoft.Teams.Apps version generation. |
.azdo/publish.yaml |
Makes internal NuGet push treat version-conflict (409) as non-fatal via allowPackageConflicts: true. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
3
to
5
| "version": "1.0", | ||
| "versionHeightOffset": -3, | ||
| "versionHeightOffset": -4, | ||
| "pathFilters": ["."], |
Comment on lines
2
to
5
| "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", | ||
| "version": "2.1.0-preview.{height}", | ||
| "versionHeightOffset": -2, | ||
| "publicReleaseRefSpec": [ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
applied some patches to releases/core to fix the released version. syncing main now.