Skip to content

sync main with patches in releases/core #505

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.

Sign up for GitHub

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

Merged
singhk97 merged 5 commits into from
May 27, 2026
Merged

sync main with patches in releases/core #505

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dc4144
adjust version
singhk97 May 13, 2026
bd4b37f
update pipeline
singhk97 May 13, 2026
d6a22de
version sync
singhk97 May 27, 2026
b0d1c4e
Merge branch 'main' into kavin/sync-version-and-pipeline
singhk97 May 27, 2026
f65f4bf
Merge branch 'main' into kavin/sync-version-and-pipeline
singhk97 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azdo/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ extends:
packageParentPath: '$(Build.ArtifactStagingDirectory)'
publishVstsFeed: '$(System.TeamProject)/TeamsSDKPreviews'
nuGetFeedType: internal
allowPackageConflicts: false # Disallow duplicate versions; bump the version to re-publish
allowPackageConflicts: true # Treat 409 (version already in feed, including deleted versions) as success
Comment thread
singhk97 marked this conversation as resolved.
publishPackageMetadata: true
retryCountOnTaskFailure: 2

Expand Down
1 change: 1 addition & 0 deletions core/src/Microsoft.Teams.Apps/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.1.0-preview.{height}",
"versionHeightOffset": -3,
Comment thread
singhk97 marked this conversation as resolved.
"publicReleaseRefSpec": [
Comment thread
singhk97 marked this conversation as resolved.
"^refs/heads/releases/core$"
],
Expand Down
2 changes: 1 addition & 1 deletion core/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.0",
"versionHeightOffset": -3,
"versionHeightOffset": -6,
"pathFilters": ["."],
Comment thread
singhk97 marked this conversation as resolved.
"publicReleaseRefSpec": [
"^refs/heads/releases/core$"
Expand Down
Loading