Use BuildTools PackageVersionPropsUrl tooling (dotnet/core-setup#3433)

All definitions need PB_PackageVersionPropsUrl to default to empty string, not undefined. If it were undefined, VSTS could leave in $(PB_PackageVersionPropsUrl) which would make the build fail when it fails to download it.

For Docker, map the environment variable on each run command.

For OSX/Windows, have VSTS set the environment variable by creating a definition variable.

Commit migrated from https://github.com/dotnet/core-setup/commit/4a5928c75fec89590d2f2d846465fa64db6be07d

diff --git a/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json
index f03503b..6ce07e2 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-Arm-BT.json
@@ -356,7 +356,7 @@
       "allowOverride": true
     },
     "DockerCommonRunArgs": {
-      "value": "--name $(PB_DockerContainerName) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -w=\"$(PB_GitDirectory)\" $(PB_DockerImageName)"
+      "value": "--name $(PB_DockerContainerName) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -w=\"$(PB_GitDirectory)\" -e \"PACKAGEVERSIONPROPSURL=$(PB_PackageVersionPropsUrl)\" $(PB_DockerImageName)"
     },
     "PB_VsoRepoUrl": {
       "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted"
@@ -414,6 +414,9 @@
     "PB_ChecksumAzureAccessToken": {
       "value": null,
       "isSecret": true
+    },
+    "PB_PackageVersionPropsUrl": {
+      "value": ""
     }
   },
   "demands": [

diff --git a/src/installer/buildpipeline/Core-Setup-Linux-BT.json b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
index 3a057bc..4a9b9c1 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Linux-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Linux-BT.json
@@ -1128,7 +1128,7 @@
       "allowOverride": true
     },
     "DockerCommonRunArgs": {
-      "value": "--name $(PB_DockerContainerName) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -w=\"$(PB_GitDirectory)\" $(PB_DockerImageName)"
+      "value": "--name $(PB_DockerContainerName) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -w=\"$(PB_GitDirectory)\" -e \"PACKAGEVERSIONPROPSURL=$(PB_PackageVersionPropsUrl)\" $(PB_DockerImageName)"
     },
     "PB_VsoRepoUrl": {
       "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted"
@@ -1266,6 +1266,9 @@
     "PB_DebianId_ubuntu1710-x64": {
       "value": null,
       "isSecret": true
+    },
+    "PB_PackageVersionPropsUrl": {
+      "value": ""
     }
   },
   "demands": [

diff --git a/src/installer/buildpipeline/Core-Setup-OSX-BT.json b/src/installer/buildpipeline/Core-Setup-OSX-BT.json
index 7e90bab..33ed156 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-OSX-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-OSX-BT.json
@@ -237,6 +237,12 @@
     },
     "PB_PortableBuild": {
       "value": "true"
+    },
+    "PB_PackageVersionPropsUrl": {
+      "value": ""
+    },
+    "PACKAGEVERSIONPROPSURL": {
+      "value": "$(PB_PackageVersionPropsUrl)"
     }
   },
   "demands": [

diff --git a/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json b/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json
index aa84624..271300f 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Windows-Arm-BT.json
@@ -544,6 +544,12 @@
     },
     "PB_BuildFullPlatformManifest": {
       "value": "false"
+    },
+    "PB_PackageVersionPropsUrl": {
+      "value": ""
+    },
+    "PACKAGEVERSIONPROPSURL": {
+      "value": "$(PB_PackageVersionPropsUrl)"
     }
   },
   "demands": [

diff --git a/src/installer/buildpipeline/Core-Setup-Windows-BT.json b/src/installer/buildpipeline/Core-Setup-Windows-BT.json
index 441e3f9..4016cc7 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Windows-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Windows-BT.json
@@ -746,6 +746,12 @@
     },
     "TeamName": {
       "value": "DotNetCore"
+    },
+    "PB_PackageVersionPropsUrl": {
+      "value": ""
+    },
+    "PACKAGEVERSIONPROPSURL": {
+      "value": "$(PB_PackageVersionPropsUrl)"
     }
   },
   "demands": [