The validation leg needs to know about the stabilization so it can download bits...

Commit migrated from https://github.com/dotnet/core-setup/commit/1d8f48ff7d49d4260d8c2f64e10f898a3c5014b3

diff --git a/src/installer/buildpipeline/Core-Setup-Signing-Validation.json b/src/installer/buildpipeline/Core-Setup-Signing-Validation.json
index 36dd6e1..3d1600f 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Signing-Validation.json
+++ b/src/installer/buildpipeline/Core-Setup-Signing-Validation.json
@@ -77,7 +77,7 @@
       },
       "inputs": {
         "filename": "$(PB_SourcesDirectory)\\build.cmd",
-        "arguments": "-signing-validation -- /p:AzureAccessToken=$(PB_AzureAccessToken) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser) /p:OptionalToolSourcePassword=$(PB_OptionalToolSourcePassword) /p:OfficialBuildId=$(OfficialBuildId) /flp:v=detailed /p:SignType=$(PB_SignType)",
+        "arguments": "-signing-validation -- /p:AzureAccessToken=$(PB_AzureAccessToken) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser) /p:OptionalToolSourcePassword=$(PB_OptionalToolSourcePassword) /p:OfficialBuildId=$(OfficialBuildId) /flp:v=detailed /p:SignType=$(PB_SignType) $(PB_AdditionalMSBuildArguments)",
         "workingFolder": "$(PB_SourcesDirectory)",
         "failOnStandardError": "false"
       }
@@ -251,6 +251,9 @@
     "PB_OptionalToolSourcePassword": {
       "value": null,
       "isSecret": true
+    },
+    "PB_AdditionalMSBuildArguments": {
+      "value": ""
     }
   },
   "demands": [

diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json
index 5de1e65..ee54e80 100644 (file)
--- a/src/installer/buildpipeline/pipeline.json
+++ b/src/installer/buildpipeline/pipeline.json
@@ -189,7 +189,8 @@
         {
           "Name": "Core-Setup-Signing-Validation",
           "Parameters": {
-            "PB_TargetArchitecture": "x64"
+            "PB_TargetArchitecture": "x64",
+             "PB_AdditionalMSBuildArguments": "/p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)"
           },
           "ReportingParameters": {
             "OperatingSystem": "Windows",