From 09bece37c07fd2f31fb64043e09f0136ddc41a18 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Thu, 2 Nov 2017 21:18:06 -0700
Subject: [PATCH] Support PB_RestoreSource in the official build definitions

Commit migrated from https://github.com/dotnet/core-setup/commit/5df0c2feb28d1471614f3959c351a8f972096ac3
---
 src/installer/buildpipeline/pipeline.json | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json
index 9d1d61d..6a88c55 100644
--- a/src/installer/buildpipeline/pipeline.json
+++ b/src/installer/buildpipeline/pipeline.json
@@ -20,6 +20,7 @@
           "Parameters": {
             "PB_DockerTag": "centos-7-d485f41-20173404063424",
             "PB_AdditionalBuildArguments":"-PortableBuild=true -strip-symbols -SkipTests=$(PB_SkipTests)",
+            "PB_AdditionalMSBuildArguments":"/p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_PortableBuild": "true"
           },
           "ReportingParameters": {
@@ -35,7 +36,7 @@
             "PB_DockerTag": "centos-6-376e1a3-20174311014331",
             "PB_TargetArchitecture": "x64",
             "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -PortableBuild=false -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments":"/p:OutputRid=rhel.6-x64",
+            "PB_AdditionalMSBuildArguments":"/p:OutputRid=rhel.6-x64 /p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_PortableBuild": "false"
           },
           "ReportingParameters": {
@@ -50,7 +51,7 @@
             "PB_DockerTag": "alpine-3.6-3148f11-20171119021156",
             "PB_TargetArchitecture": "x64",
             "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -PortableBuild=false -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments":"/p:OutputRid=alpine.3.6-x64",
+            "PB_AdditionalMSBuildArguments":"/p:OutputRid=alpine.3.6-x64 /p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_PortableBuild": "false"
           },
           "ReportingParameters": {
@@ -65,7 +66,7 @@
             "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20170319080304",
             "PB_TargetArchitecture": "arm",
             "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
-            "PB_AdditionalMSBuildArguments": "",
+            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_CrossBuildArgs": "-e ROOTFS_DIR ",
             "PB_PortableBuild": "true"
           },
@@ -80,7 +81,7 @@
           "Name": "Core-Setup-OSX-BT",
           "Parameters": {
             "PB_AdditionalBuildArguments": "-PortableBuild=true -strip-symbols -SkipTests=$(PB_SkipTests)",
-            "PB_AdditionalMSBuildArguments": "",
+            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_PortableBuild": "true"
           },
           "ReportingParameters": {
@@ -93,7 +94,7 @@
         {
           "Name": "Core-Setup-Windows-Arm-BT",
           "Parameters": {
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true",
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_TargetArchitecture": "arm",
             "PB_PortableBuild": "true"
           },
@@ -107,7 +108,7 @@
         {
           "Name": "Core-Setup-Windows-Arm-BT",
           "Parameters": {
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr",
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr /p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_TargetArchitecture": "arm64",
             "PB_PortableBuild": "true"
           },
@@ -123,7 +124,7 @@
           "Parameters": {
             "PB_TargetArchitecture": "x64",
             "PB_PortableBuild": "true",
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests)",
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests) /p:DotNetRestoreSources=$(PB_RestoreSource)",
             "PB_PublishRidAgnosticPackages": "true",
             "PB_BuildFullPlatformManifest": "true"
           },
@@ -139,7 +140,7 @@
           "Parameters": {
             "PB_TargetArchitecture": "x86",
             "PB_PortableBuild": "true",
-            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests)"
+            "PB_AdditionalMSBuildArguments": "/p:SkipTests=$(PB_SkipTests) /p:DotNetRestoreSources=$(PB_RestoreSource)"
           },
           "ReportingParameters": {
             "OperatingSystem": "Windows",
-- 
2.7.4