From 3dc4144163cd55d8ae27b5bb3107f2a7805dc2ab Mon Sep 17 00:00:00 2001 From: Kavin Singh Date: Wed, 13 May 2026 12:13:32 -0700 Subject: [PATCH 1/3] adjust version --- core/src/Microsoft.Teams.Apps/version.json | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/Microsoft.Teams.Apps/version.json b/core/src/Microsoft.Teams.Apps/version.json index 1621b7c1..39afa9bd 100644 --- a/core/src/Microsoft.Teams.Apps/version.json +++ b/core/src/Microsoft.Teams.Apps/version.json @@ -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": -1, "publicReleaseRefSpec": [ "^refs/heads/releases/core$" ], From bd4b37ff524746d3d2aba94240ab82cedfb6ba8e Mon Sep 17 00:00:00 2001 From: Kavin Singh Date: Wed, 13 May 2026 12:33:55 -0700 Subject: [PATCH 2/3] update pipeline --- .azdo/publish.yaml | 2 +- core/src/Microsoft.Teams.Apps/version.json | 2 +- core/version.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azdo/publish.yaml b/.azdo/publish.yaml index e105f572..752079d9 100644 --- a/.azdo/publish.yaml +++ b/.azdo/publish.yaml @@ -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 publishPackageMetadata: true retryCountOnTaskFailure: 2 diff --git a/core/src/Microsoft.Teams.Apps/version.json b/core/src/Microsoft.Teams.Apps/version.json index 39afa9bd..553fa016 100644 --- a/core/src/Microsoft.Teams.Apps/version.json +++ b/core/src/Microsoft.Teams.Apps/version.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", "version": "2.1.0-preview.{height}", - "versionHeightOffset": -1, + "versionHeightOffset": -2, "publicReleaseRefSpec": [ "^refs/heads/releases/core$" ], diff --git a/core/version.json b/core/version.json index afb78bea..317520c4 100644 --- a/core/version.json +++ b/core/version.json @@ -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": -4, "pathFilters": ["."], "publicReleaseRefSpec": [ "^refs/heads/releases/core$" From d6a22de5e5f342a6bc956f4979dd379786f62843 Mon Sep 17 00:00:00 2001 From: Kavin Singh Date: Wed, 27 May 2026 09:53:15 -0700 Subject: [PATCH 3/3] version sync --- core/src/Microsoft.Teams.Apps/version.json | 2 +- core/version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/Microsoft.Teams.Apps/version.json b/core/src/Microsoft.Teams.Apps/version.json index 553fa016..912d23ef 100644 --- a/core/src/Microsoft.Teams.Apps/version.json +++ b/core/src/Microsoft.Teams.Apps/version.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", "version": "2.1.0-preview.{height}", - "versionHeightOffset": -2, + "versionHeightOffset": -3, "publicReleaseRefSpec": [ "^refs/heads/releases/core$" ], diff --git a/core/version.json b/core/version.json index 317520c4..3d7b9ff8 100644 --- a/core/version.json +++ b/core/version.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", "version": "1.0", - "versionHeightOffset": -4, + "versionHeightOffset": -6, "pathFilters": ["."], "publicReleaseRefSpec": [ "^refs/heads/releases/core$"