From e9c023eda33aae729bee9def765120be9cb7faab Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 09:20:04 -0600 Subject: [PATCH 1/3] Fix nuget versioning steps --- build/yaml/templates/nuget-versioning-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/yaml/templates/nuget-versioning-steps.yml b/build/yaml/templates/nuget-versioning-steps.yml index 1e9f430aa5..9192584a46 100644 --- a/build/yaml/templates/nuget-versioning-steps.yml +++ b/build/yaml/templates/nuget-versioning-steps.yml @@ -13,7 +13,7 @@ steps: $deploymentRing = $deploymentRingOverride; } - if ($deploymentRing.ToLowerInvariant() -eq "rc") { + if (($deploymentRing.ToLowerInvariant() -eq "rc") -or ($deploymentRing.ToLowerInvariant() -eq "preview")) { $releaseCandidateNumber = "$env:RELEASECANDIDATENUMBER"; "Release Candidate Number = $releaseCandidateNumber"; From 29c0050b137546aba9c65230740a8785d13a0bf7 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 09:36:10 -0600 Subject: [PATCH 2/3] Fix Teams test reference --- .../Microsoft.Bot.Components.Teams.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj index 112c033e7f..335fdf0bd6 100644 --- a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj +++ b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj @@ -10,8 +10,8 @@ - - + + From 66c1e3e5fea4e855b0e31e9ad832c965d0587731 Mon Sep 17 00:00:00 2001 From: Thomas Chung Date: Wed, 7 Jul 2021 09:38:14 -0600 Subject: [PATCH 3/3] Fix Microsoft.Bot.Builder.Dialogs.Adaptive.Testing --- .../Microsoft.Bot.Components.Teams.Tests.csproj | 2 +- .../calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj | 2 +- .../skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj | 2 +- .../people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj index 335fdf0bd6..ac8cdfb095 100644 --- a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj +++ b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj b/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj index f98e05e4b4..5646b67ff8 100644 --- a/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj +++ b/tests/unit/skills/calendar/Microsoft.Bot.Dialogs.Tests.Skills.Calendar.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj b/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj index e2e3f0f912..1794802507 100644 --- a/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj +++ b/tests/unit/skills/common/Microsoft.Bot.Dialogs.Tests.Common.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj b/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj index a4703ce76e..497bfefb6c 100644 --- a/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj +++ b/tests/unit/skills/people/Microsoft.Bot.Dialogs.Tests.Skills.People.csproj @@ -8,7 +8,7 @@ - +