From 54ee33d759d3c79cbb7afa27b1307a13a7975355 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 25 Feb 2019 15:06:01 -0800
Subject: [PATCH] Add variable to control the version of the signing task we
 use (#8982)

---
 tools/releaseBuild/azureDevOps/WindowsBuild.yml        | 10 +++++++---
 .../azureDevOps/templates/mac-package-signing.yml      |  2 ++
 tools/releaseBuild/azureDevOps/templates/nuget.yml     |  2 ++
 .../azureDevOps/templates/windows-build.yml            |  8 +++++---
 .../azureDevOps/templates/windows-package-signing.yml  |  2 ++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/WindowsBuild.yml b/tools/releaseBuild/azureDevOps/WindowsBuild.yml
index 5f5f252d66..cfb15f9c1f 100644
--- a/tools/releaseBuild/azureDevOps/WindowsBuild.yml
+++ b/tools/releaseBuild/azureDevOps/WindowsBuild.yml
@@ -154,9 +154,11 @@ jobs:
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     inputs:
-       signConfigXml: '$(Build.SourcesDirectory)\tools\releaseBuild\signing.xml'
-       inPathRoot: '$(Symbols)'
-       outPathRoot: '$(Symbols)\signed'
+      signConfigXml: '$(Build.SourcesDirectory)\tools\releaseBuild\signing.xml'
+      inPathRoot: '$(Symbols)'
+      outPathRoot: '$(Symbols)\signed'
+      binVersion: $(SigingVersion)
+      binVersionOverride: $(SigningVersionOverride)
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), ne(variables['SkipFxDependent'], 'true'))
 
   - powershell: |
@@ -315,6 +317,8 @@ jobs:
     inputs:
       signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
       outPathRoot: '$(Build.StagingDirectory)\signedPackages'
+      binVersion: $(SigingVersion)
+      binVersionOverride: $(SigningVersionOverride)
     continueOnError: true
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
 
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index 39732a65ee..04e1af564d 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -51,6 +51,8 @@ jobs:
     inputs:
       signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
       outPathRoot: '$(Build.StagingDirectory)\signedMacOSPackages'
+      binVersion: $(SigingVersion)
+      binVersionOverride: $(SigningVersionOverride)
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
 
   - template: upload-final-results.yml
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index a99f1051ec..da34068453 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -144,6 +144,8 @@ jobs:
       signConfigXml: '$(PackagePath)\NugetSigning.xml'
       inPathRoot: '$(PackagePath)'
       outPathRoot: '$(System.ArtifactsDirectory)\signed'
+      binVersion: $(SigingVersion)
+      binVersionOverride: $(SigningVersionOverride)
 
   - powershell: |
       Import-Module $(Build.SourcesDirectory)\build.psm1 -Force
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-build.yml
index 6b457cfd78..33ed32fbab 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-build.yml
@@ -124,9 +124,11 @@ jobs:
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     inputs:
-       signConfigXml: '$(Build.SourcesDirectory)\tools\releaseBuild\signing.xml'
-       inPathRoot: '$(Symbols)'
-       outPathRoot: '$(Symbols)\signed'
+      signConfigXml: '$(Build.SourcesDirectory)\tools\releaseBuild\signing.xml'
+      inPathRoot: '$(Symbols)'
+      outPathRoot: '$(Symbols)\signed'
+      binVersion: $(SigingVersion)
+      binVersionOverride: $(SigningVersionOverride)
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), ne(variables['SkipFxDependent'], 'true'))
 
   - powershell: |
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index 8edc51745b..afab79291c 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -60,6 +60,8 @@ jobs:
     inputs:
       signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
       outPathRoot: '$(Build.StagingDirectory)\signedPackages'
+      binVersion: $(SigingVersion)
+      binVersionOverride: $(SigningVersionOverride)
     condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
 
   - template: upload.yml