update runsettings generator to have the build and test match in the runsettings file

azure-pipelines-official.yml

@@ -77,7 +77,7 @@ jobs:
     displayName: 'OPTPROF - Set VSTS variables for vsman files'
     condition: succeededOrFailed()
 
-  - task: ms-vseng.MicroBuildTasks.0e9d0d4d-71ec-4e4e-ae40-db9896f1ae74.MicroBuildBuildVSBootstrapper@1
+  - task: ms-vseng.MicroBuildTasks.0e9d0d4d-71ec-4e4e-ae40-db9896f1ae74.MicroBuildBuildVSBootstrapper@2
     inputs:
       vsMajorVersion: 16
       channelName: int.$(InsertTargetBranchShortName)

eng/Versions.props

@@ -151,7 +151,7 @@
     <RoslynToolsVSIXExpInstallerVersion>1.0.0-beta2-63222-01</RoslynToolsVSIXExpInstallerVersion>
     <RoslynToolsBuildTasksVersion>1.0.0-beta3.18526.1</RoslynToolsBuildTasksVersion>
     <RoslynToolsOptProfVersion>1.0.0-beta3.18524.2</RoslynToolsOptProfVersion>
-    <RoslynOptProfRunSettingsGeneratorVersion>1.0.0-beta3.18603.3</RoslynOptProfRunSettingsGeneratorVersion>
+    <RoslynOptProfRunSettingsGeneratorVersion>1.0.0-beta3.18610.1</RoslynOptProfRunSettingsGeneratorVersion>
     <RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>4.3.0</RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>
     <RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>
     <StreamJsonRpcVersion>1.3.23</StreamJsonRpcVersion>

eng/createrunsettings.ps1

@@ -15,8 +15,8 @@ try {
     $optProfToolExe = Join-Path $optProfToolDir "tools\roslyn.optprof.runsettings.generator.exe"
     $configFile = Join-Path $EngRoot "config\OptProf.json"
     $outputFolder = Join-Path $VSSetupDir "Insertion\RunSettings"
-    $optProfArgs = "--configFile $configFile --outputFolder $outputFolder --buildNumber 28320.3001 "
-
+    $optProfArgs = "--configFile $configFile --outputFolder $outputFolder"
+    
     # https://github.com/dotnet/roslyn/issues/31486
     $dest = Join-Path $RepoRoot ".vsts-ci.yml"
     try {

eng/test-build-correctness.ps1

@@ -64,7 +64,7 @@ try {
     Create-Directory $bootstrapperInfoFolder
     
     $bootstrapperInfoPath = Join-Path $bootstrapperInfoFolder "BootstrapperInfo.json"
-    $bootstrapperInfoContent = "[{""VSBuildVersion"":  ""42.42.42424.42""}]"
+    $bootstrapperInfoContent = "[{""VSBuildVersion"":  ""42.42.42424.42""}, {""BuildDrop"":  ""https://vsdrop.corp.microsoft.com/file/v1/Products/42.42.42.42/42.42.42.42""}]"
     $bootstrapperInfoContent >> $bootstrapperInfoPath
 
     # generate run settings