From e042dfd3b27054f5ed8eb8bdd8a0ba09cd25f43b Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Sun, 9 Dec 2018 20:50:02 -0800
Subject: [PATCH] Do not include optprof in VSSetup

---
 azure-pipelines-official.yml | 4 ++--
 eng/build.ps1                | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index bbe497796e934..60732667f0bc3 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -63,7 +63,7 @@ jobs:
     inputs:
       dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
       buildNumber: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)'
-      sourcePath: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion\OptProf'
+      sourcePath: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
       toLowerCase: false
       usePat: false
     displayName: 'OPTPROF - Publish to Artifact Services - ProfilingInputs'
@@ -107,7 +107,7 @@ jobs:
   # Publish scripts to get the branch of VS that this inserts into
   - task: PublishBuildArtifacts@1
     inputs:
-      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion\BranchInfo'
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\BranchInfo'
       ArtifactName: BranchInfo
       ArtifactType: Container
     displayName: 'OPTPROF - Publish Artifact: BranchInfo'
diff --git a/eng/build.ps1 b/eng/build.ps1
index f2524a5f01f6d..34f6924993c90 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -181,13 +181,14 @@ function Build-OptProfData() {
     $optProfToolExe = Join-Path $optProfToolDir "tools\roslyn.optprof.exe"
     $configFile = Join-Path $RepoRoot "eng\config\OptProf.json"
     $insertionFolder = Join-Path $VSSetupDir "Insertion"
-    $outputFolder = Join-Path $insertionFolder "OptProf"
-    Write-Host "Generating optprof data using '$configFile' into '$outputFolder'"
-    $optProfArgs = "--configFile $configFile --insertionFolder $insertionFolder --outputFolder $outputFolder"
+    $outputFolder = Join-Path $ArtifactsDir "OptProf\$configuration"
+    $dataFolder = Join-Path $outputFolder "Data"
+    Write-Host "Generating optprof data using '$configFile' into '$dataFolder'"
+    $optProfArgs = "--configFile $configFile --insertionFolder $insertionFolder --outputFolder $dataFolder"
     Exec-Console $optProfToolExe $optProfArgs
 
     # Write Out Branch we are inserting into
-    $vsBranchFolder = Join-Path $insertionFolder "BranchInfo"
+    $vsBranchFolder = Join-Path $outputFolder "BranchInfo"
     New-Item -ItemType Directory -Force -Path $vsBranchFolder
     $vsBranchText = Join-Path $vsBranchFolder "vsbranch.txt"
     # InsertTargetBranchFullName is defined in .vsts-ci.yml