From ce0f2ee2a870a3f7081480c9b0d855f37c0c6c6e Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 21 Sep 2021 13:08:05 -0700 Subject: [PATCH 1/5] Test on the dev version setting. --- eng/pipelines/templates/steps/build-artifacts.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml index 6103abcef4c0..b8f2370d1581 100644 --- a/eng/pipelines/templates/steps/build-artifacts.yml +++ b/eng/pipelines/templates/steps/build-artifacts.yml @@ -58,7 +58,17 @@ steps: parameters: ServiceDirectory: ${{ parameters.ServiceDirectory }} BuildTargetingString: ${{ parameters.BuildTargetingString }} - + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/scripts/Save-Package-Properties.ps1 + arguments: > + -ServiceDirectory ${{parameters.ServiceDirectory}} + -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo + -AddDevVersion + pwsh: true + workingDirectory: $(Pipeline.Workspace) + displayName: Update package properties with dev version + condition: and(succeeded(),eq(variables['SetDevVersion'],'true')) - task: PythonScript@0 displayName: 'Generate Packages' inputs: From dd29eb64580a685296712865fb9bfd2d3914e961 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 21 Sep 2021 13:26:13 -0700 Subject: [PATCH 2/5] temporarily set version to true --- .../pipelines/templates/steps/daily-dev-build-variable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml index 5d53a5265c7a..025274f7f968 100644 --- a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml +++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml @@ -15,7 +15,7 @@ steps: displayName: Dump Package properties condition: succeeded() - pwsh: | - $setDailyDevBuild = "false" + $setDailyDevBuild = "true" if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) { $setDailyDevBuild = "true" } From b84a95c874a8bc0729c4975dbd7832fdd220cb4e Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 21 Sep 2021 15:54:26 -0700 Subject: [PATCH 3/5] temporarily set version to true2 --- .../pipelines/templates/steps/daily-dev-build-variable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml index 025274f7f968..527acd7dd4f3 100644 --- a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml +++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml @@ -21,4 +21,4 @@ steps: } echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild" displayName: "Setup Versioning Properties" - condition: and(succeeded(), eq(variables['SetDevVersion'], '')) + condition: and(succeeded()) From c6f2c32d04c215e3c63707a79b3cefbcc5c0338a Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 21 Sep 2021 16:04:24 -0700 Subject: [PATCH 4/5] temporarily set version to true3 --- .../pipelines/templates/steps/daily-dev-build-variable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml index 527acd7dd4f3..bd5565fb0f20 100644 --- a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml +++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml @@ -21,4 +21,4 @@ steps: } echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild" displayName: "Setup Versioning Properties" - condition: and(succeeded()) + condition: succeeded() From 3876f4341ab5da9116f2cd591af64d54927a9ff8 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 21 Sep 2021 16:15:08 -0700 Subject: [PATCH 5/5] Writing dev version into json file. --- .../pipelines/templates/steps/daily-dev-build-variable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml index bd5565fb0f20..5d53a5265c7a 100644 --- a/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml +++ b/eng/common/pipelines/templates/steps/daily-dev-build-variable.yml @@ -15,10 +15,10 @@ steps: displayName: Dump Package properties condition: succeeded() - pwsh: | - $setDailyDevBuild = "true" + $setDailyDevBuild = "false" if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) { $setDailyDevBuild = "true" } echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild" displayName: "Setup Versioning Properties" - condition: succeeded() + condition: and(succeeded(), eq(variables['SetDevVersion'], ''))