Use optional tooling to merge optimization data

3 files changed, 41 insertions, 3 deletions

diff --git a/Tools-Override/Build.Common.targets b/Tools-Override/Build.Common.targets
index 90386aeed5..323f375902 100644
--- a/Tools-Override/Build.Common.targets
+++ b/Tools-Override/Build.Common.targets
@@ -147,6 +147,21 @@
   <Import Project="$(MSBuildThisFileDirectory)packageresolve.targets" Condition="'$(ExcludePackageResolveImport)'!='true'" />
 
   <!--
+    Import the optional tooling restore and resolve targets
+
+      Inputs:
+        OptionalToolSource - If not set, optional tools are not restored
+        OptionalToolSourceUser - If not set, no authentication is used to access the feed
+        OptionalToolSourcePassword - If not set, no authentication is used to access the feed
+
+      Depends on properties:
+        DnuRestoreCommand - Used to restore the optional tool packages
+        PackagesDir - Location to resolve optional tool package assets
+        ToolsDir - Location to find optional-tool-runtime project.json
+  -->
+  <Import Project="$(MSBuildThisFileDirectory)OptionalTooling.targets" />
+
+  <!-- 
     Import the partial facade generation targets
 
       Inputs:
diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Windows.json b/buildpipeline/DotNet-CoreFx-Trusted-Windows.json
index b025522257..bcc87ad1f3 100644
--- a/buildpipeline/DotNet-CoreFx-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreFx-Trusted-Windows.json
@@ -105,7 +105,7 @@
       },
       "inputs": {
         "filename": "$(Build.SourcesDirectory)\\corefx\\sync.cmd",
-        "arguments": "$(PB_SyncArguments)",
+        "arguments": "$(PB_SyncArguments) $(PB_OptionalToolingSyncArguments)",
         "workingFolder": "corefx",
         "failOnStandardError": "false"
       }
@@ -141,7 +141,7 @@
       },
       "inputs": {
         "filename": "$(Build.SourcesDirectory)\\corefx\\build.cmd",
-        "arguments": "$(PB_BuildArguments)",
+        "arguments": "$(PB_BuildArguments) $(PB_PipelineBuildMSBuildArguments)",
         "workingFolder": "corefx",
         "failOnStandardError": "false"
       }
@@ -466,6 +466,28 @@
     "PB_CreateHelixArguments": {
       "value": "/t:CloudBuild /p:ArchGroup=x64 /p:ConfigurationGroup=Release /p:\"EnableCloudTest=true\" /p:\"BuildMoniker=none\" /p:\"TargetQueue=Windows.10.Amd64\" /p:\"TestProduct=corefx\" /p:\"TimeoutInSeconds=1200\" /p:\"TargetOS=Windows_NT\" /p:FilterToOSGroup=Windows_NT",
       "allowOverride": true
+    },
+    "PB_OptionalToolSource": {
+      "value": null,
+      "allowOverride": true,
+      "isSecret": true
+    },
+    "PB_OptionalToolSourceUser": {
+      "value": null,
+      "allowOverride": true,
+      "isSecret": true
+    },
+    "PB_OptionalToolSourcePAT": {
+      "value": null,
+      "allowOverride": true,
+      "isSecret": true
+    },
+    "PB_OptionalToolingSyncArguments": {
+      "value": "/p:OptionalToolSource=$(PB_OptionalToolSource) /p:OptionalToolSourceUser=$(PB_OptionalToolSourceUser);OptionalToolSourcePassword=$(PB_OptionalToolSourcePAT)"
+    },
+    "PB_PipelineBuildMSBuildArguments": {
+      "value": "",
+      "allowOverride": true
     }
   },
   "demands": [
diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json
index 516ee0f0f2..9c1f2276a5 100644
--- a/buildpipeline/pipeline.json
+++ b/buildpipeline/pipeline.json
@@ -213,7 +213,8 @@
         "TreatWarningsAsErrors": "false"
       },
       "BuildParameters": {
-        "PB_ConfigurationGroup": "Release"
+        "PB_ConfigurationGroup": "Release",
+        "PB_PipelineBuildMSBuildArguments": "/p:EnableProfileGuidedOptimization=true"
       },
       "Definitions": [
         {