Initial work to upload optimization training data

.vsts-ci.yml

@@ -11,6 +11,8 @@ queue:
 
 variables:
   BuildPlatform: 'Any CPU'
+  InsertTargetBranchFullName: 'lab/d16.0stg472'
+  InsertTargetBranchShortName: 'd16.0stg472'
 steps:
 - task: NuGetCommand@2
   inputs:
@@ -22,6 +24,11 @@ steps:
     signType: real
   condition: and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
 
+- task: ms-vseng.MicroBuildTasks.965C8DC6-1483-45C9-B384-5AC75DA1F1A4.MicroBuildOptProfPlugin@1
+  inputs:
+    skipRunOptimize: true
+  displayName: 'Install OptProf Plugin'
+
 - task: ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
   inputs:
     feedSource: 'https://devdiv-test.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json'
@@ -64,6 +71,65 @@ steps:
     maximumCpuCount: true
     logProjectEvents: false
 
+### BEGIN OPTPROF TASKS ###
+
+# Publish optprof configuration files
+- task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
+  inputs:
+    dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
+    buildNumber: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)'
+    sourcePath: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\DevDivInsertionFiles\OptProf'
+    toLowerCase: false
+    usePat: false
+  displayName: 'OPTPROF - Publish to Artifact Services - ProfilingInputs'
+  condition: succeededOrFailed()
+
+# Created a exe that will install visual studio with this version 
+- task: PowerShell@2
+  inputs:
+    filePath: build\scripts\setmanifestpaths.ps1
+    failOnStderr: true
+  displayName: 'OPTPROF - Set VSTS variables for vsman files'
+  condition: succeededOrFailed()
+
+- task: ms-vseng.MicroBuildTasks.0e9d0d4d-71ec-4e4e-ae40-db9896f1ae74.MicroBuildBuildVSBootstrapper@1
+  inputs:
+    vsMajorVersion: 16
+    channelName: int.$(InsertTargetBranchShortName)
+    manifests: $(SetupManifests)
+    outputFolder: '$(Build.SourcesDirectory)\Binaries\VSSetup\$(BuildConfiguration)\Insertion'
+  displayName: 'OPTPROF - Build VS bootstrapper'
+  condition: succeededOrFailed()
+
+# Publish run settings
+- task: PowerShell@2
+  inputs:
+    filePath: build\scripts\createrunsettings.ps1
+    arguments: -release
+    failOnStderr: true
+  displayName: 'OPTPROF - generate runsettings file'
+  condition: succeededOrFailed()
+
+# Publish bootstrapper info
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: $(Build.StagingDirectory)\MicroBuild\Output
+    ArtifactName: MicroBuildOutputs
+    ArtifactType: Container
+  displayName: 'OPTPROF - Publish Artifact: MicroBuildOutputs'
+  condition: succeededOrFailed()
+
+# Publish scripts to get the branch of VS that this inserts into
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\DevDivInsertionFiles\BranchInfo'
+    ArtifactName: BranchInfo
+    ArtifactType: Container
+  displayName: 'OPTPROF - Publish Artifact: BranchInfo'
+  condition: succeededOrFailed()
+
+### END OPTPROF TASKS ###
+
 - task: PublishBuildArtifacts@1
   displayName: Publish Logs
   inputs:

build/Targets/Packages.props

@@ -174,6 +174,8 @@
     <RoslynToolsNuGetRepackVersion>1.0.0-beta3.18524.1</RoslynToolsNuGetRepackVersion>
     <RoslynToolsBuildTasksVersion>1.0.0-beta3.18524.1</RoslynToolsBuildTasksVersion>
     <RoslynToolsReferenceAssembliesVersion>0.1.3</RoslynToolsReferenceAssembliesVersion>
+    <RoslynToolsOptProfVersion>1.0.0-beta3.18524.2</RoslynToolsOptProfVersion>
+    <RoslynOptProfRunSettingsGeneratorVersion>1.0.0-beta3.18524.2</RoslynOptProfRunSettingsGeneratorVersion>
     <RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>4.3.0</RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>
     <RoslynMicrosoftVisualStudioExtensionManagerVersion>0.0.4</RoslynMicrosoftVisualStudioExtensionManagerVersion>
     <StreamJsonRpcVersion>1.3.23</StreamJsonRpcVersion>

build/Targets/Settings.props

@@ -134,7 +134,7 @@
     <PackageReference Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsAnalyzersVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(MicrosoftVisualStudioThreadingAnalyzersVersion)" PrivateAssets="all" />
   </ItemGroup>
-
+  
   <!--
     Language specifc settings
   -->

build/ToolsetPackages/RoslynToolset.csproj

@@ -31,6 +31,8 @@
     <PackageReference Include="RoslynTools.Microsoft.LocateVS" Version="$(RoslynToolsMicrosoftLocateVSVersion)" ExcludeAssets="all" />
     <PackageReference Include="RoslynTools.VSIXExpInstaller" Version="$(RoslynToolsVSIXExpInstallerVersion)" ExcludeAssets="all" />
     <PackageReference Include="RoslynTools.ModifyVsixManifest" Version="$(RoslynToolsModifyVsixManifestVersion)" ExcludeAssets="all" />
+    <PackageReference Include="RoslynTools.OptProf" Version="$(RoslynToolsOptProfVersion)" ExcludeAssets="all" />
+    <PackageReference Include="Roslyn.OptProf.RunSettings.Generator" Version="$(RoslynOptProfRunSettingsGeneratorVersion)" ExcludeAssets="all" />
     <PackageReference Include="RoslynTools.MSBuild" Version="$(RoslynToolsMSBuildVersion)" ExcludeAssets="all" />
     <PackageReference Include="xunit.runner.wpf" Version="$(xunitrunnerwpfVersion)" ExcludeAssets="all" />
     <PackageReference Include="vswhere" Version="$(vswhereVersion)" ExcludeAssets="all" />

build/config/optprof.json

+{
+  "products": [
+    {
+      "name": "Roslyn.VisualStudio.Setup.vsix",
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner"
+          ]
+        },
+        {
+          "container": "VSPE",
+          "testCases": [
+            "VSPE.OptProfTests.vs_perf_designtime_ide_searchtest",
+            "VSPE.OptProfTests.vs_perf_designtime_editor_intellisense_globalcompletionlist_cs",
+            "VSPE.OptProfTests.vs_asl_cs_scenario",
+            "VSPE.OptProfTests.vs_ddbvtqa_vbwi",
+            "VSPE.OptProfTests.vs_asl_vb_scenario",
+            "VSPE.OptProfTests.vs_env_solution_createnewproject_vb_winformsapp"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "ExpressionEvaluatorPackage.vsix",
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Microsoft.CodeAnalysis.Compilers.vsix",
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Roslyn.VisualStudio.InteractiveComponents.vsix",
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.EditingAndDesigner"
+          ]
+        }
+      ]
+    }
+  ],
+  "assemblies" : [
+    {
+      "assembly": "System.Collections.Immutable.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "Common7/IDE/PrivateAssemblies",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "System.Reflection.Metadata.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "Common7/IDE/PrivateAssemblies",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "Microsoft.Build.Conversion.Core.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "Microsoft.Build.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "Microsoft.Build.Engine.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "Microsoft.Build.Framework.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "Microsoft.Build.Tasks.Core.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "Microsoft.Build.Utilities.Core.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    },
+    {
+      "assembly": "System.Threading.Tasks.Dataflow.dll",
+      "instrumentationArguments": [
+        {
+          "relativeInstallationFolder": "MSBuild/15.0/Bin",
+          "instrumentationExecutable" : "Common7/IDE/vsn.exe"
+        }
+      ],
+      "tests": [
+        {
+          "container": "DDRIT.RPS.CSharp",
+          "testCases": [
+            "DDRIT.RPS.CSharp.CSharpTest.BuildAndDebugging"
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

build/scripts/createrunsettings.ps1

+[CmdletBinding(PositionalBinding=$false)]
+param (
+    [switch]$release = $false)
+
+Set-StrictMode -version 2.0
+$ErrorActionPreference = "Stop"
+
+try {
+    . (Join-Path $PSScriptRoot "build-utils.ps1")
+    Push-Location $repoDir
+    
+    Write-Host "Repo Dir $repoDir"
+    Write-Host "Binaries Dir $binariesDir"
+    
+    $buildConfiguration = if ($release) { "Release" } else { "Debug" }
+    $configDir = Join-Path (Join-Path $binariesDir "VSSetup") $buildConfiguration
+    
+    $optProfToolDir = Get-PackageDir "Roslyn.OptProf.RunSettings.Generator"
+    $optProfToolExe = Join-Path $optProfToolDir "tools\roslyn.optprof.runsettings.generator.exe"
+    $configFile = Join-Path $repoDir "build\config\optprof.json"
+    $outputFolder = Join-Path $configDir "Insertion\RunSettings"
+    $optProfArgs = "--configFile $configFile --outputFolder $outputFolder --buildNumber 28218.3001 "
+    
+    Exec-Console $optProfToolExe $optProfArgs
+    exit 0
+}
+catch {
+    Write-Host $_
+    Write-Host $_.Exception
+    Write-Host $_.ScriptStackTrace
+    exit 1
+}
+finally {
+    Pop-Location
+}
\ No newline at end of file

build/scripts/findibc.ps1

+[CmdletBinding(PositionalBinding=$false)]
+param (
+    [string]$intermediateAssembly,
+    [string]$ibcRootFolder)
+
+try {
+    $assemblyName = [System.IO.Path]::GetFileName($intermediateAssembly)
+    $fullPath = [System.IO.Path]::GetFullPath($ibcRootFolder)
+    if(![System.IO.Directory]::Exists($fullPath)){
+        # There is no product data directory return
+        return ""
+    }
+    $root = (New-Object -TypeName System.IO.DirectoryInfo -ArgumentList $fullPath)
+    $dllEntry = [System.Linq.Enumerable]::SingleOrDefault($root.EnumerateFiles($assemblyName,[System.IO.SearchOption]::AllDirectories))
+    if (!$dllEntry)
+    {
+        return "";
+    }
+
+    $ibcFileInfos = $dllEntry.Directory.EnumerateFiles("*.ibc")
+    $strings = (New-Object "System.Collections.Generic.List[System.String]")
+    foreach ($ibcFileInfo in $ibcFileInfos)
+    {
+        $name = $ibcFileInfo.FullName
+        $strings.Add($name)
+    }
+    $ibcFiles = $strings -join ' '
+
+    return $ibcFiles
+}
+catch {
+    Write-Host $_
+    Write-Host $_.Exception
+    Write-Host $_.ScriptStackTrace
+    exit 1
+}
+finally {
+    Pop-Location
+}
\ No newline at end of file

build/scripts/setmanifestpaths.ps1

+# Take care to return nothing if we don't yet have any vsman files
+# as will occur at the start of the build.
+# This will allow us to set it after the build when called again.
+
+$vsmanpath = "Binaries/VSSetup/$Env:BuildConfiguration/Insertion"
+if (Test-Path $vsmanpath) {
+    $SetupManifests = [string]::Join(',', (Get-ChildItem "Binaries/VSSetup/$Env:BuildConfiguration/Insertion/*.vsman"))
+    Write-Host "Using the following manifests '$SetupManifests'"
+    Write-Host "SetupManifests=$SetupManifests"
+    Write-Host "##vso[task.setvariable variable=SetupManifests;]$SetupManifests"
+    Set-Item -Path "env:SetupManifests" -Value $SetupManifests
+}
+else {
+    Write-Host "Unable to find manifest files"
+}
\ No newline at end of file