Dev/trevors/mbpresteps broken template/testnewmbpresteps

Directory.Packages.props

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <MicroBuildVersion>2.0.147</MicroBuildVersion>
+    <MicroBuildVersion>2.0.149</MicroBuildVersion>
     <CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
     <CodeAnalysisVersion Condition="'$(IsTestProject)'=='true'">4.4.0</CodeAnalysisVersion>
     <CodefixTestingVersion>1.1.1</CodefixTestingVersion>

azure-pipelines.yml

@@ -24,14 +24,12 @@ parameters:
   default: true
 
 variables:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  BuildConfiguration: Release
-  # codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/
-  NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/
+- template: /azure-pipelines/BuildStageVariables.yml@self
 
 jobs:
 - template: azure-pipelines/build.yml
   parameters:
+    Is1ESPT: false
     includeMacOS: ${{ parameters.includeMacOS }}
     ShouldSkipOptimize:
     RunTests: ${{ parameters.RunTests }}

azure-pipelines/BuildStageVariables.yml

@@ -0,0 +1,5 @@
+variables:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  BuildConfiguration: Release
+  NUGET_PACKAGES: $(Agent.TempDirectory)/.nuget/packages/
+  # codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/

azure-pipelines/GlobalVariables.yml

@@ -0,0 +1,4 @@
+variables:
+  # These variables are required for MicroBuild tasks
+  TeamName: VS IDE
+  TeamEmail: vsidemicrobuild@microsoft.com

azure-pipelines/OptProf.yml

@@ -18,21 +18,11 @@ schedules:
 #    ref: refs/heads/test
 
 variables:
-- name: TreatWarningsAsErrors
-  value: true
-- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
-  value: true
-- name: BuildConfiguration
-  value: Release
-- name: BuildPlatform
-  value: Any CPU
-- name: NUGET_PACKAGES
-  value: $(Agent.TempDirectory)/.nuget/packages
+- template: BuildStageVariables.yml
 - name: PublicRelease
   value: false # avoid using nice version since we're building a preliminary/unoptimized package
-- name: SignType
-  value: real
-- group: Library.Template
+- name: IsOptProf
+  value: true
 
 stages:
 - stage: Library
@@ -41,9 +31,16 @@ stages:
   jobs:
   - template: build.yml
     parameters:
+      Is1ESPT: false
+      RealSign: true
+      EnableLocalization: false
+      EnableOptProf: true
+      EnableCompliance: false
       windowsPool: VSEngSS-MicroBuild2022-1ES
       includeMacOS: false
       ShouldSkipOptimize: true
+      IsOptProf: true
+      RunTests: false
 - stage: QueueVSBuild
   jobs:
   - job: QueueOptProf
@@ -85,7 +82,7 @@ stages:
         packagesToPush: $(Agent.TempDirectory)/VSInsertion-Windows/*.nupkg
         publishVstsFeed: 97a41293-2972-4f48-8c0e-05493ae82010 # VS feed
         allowPackageConflicts: true
-    - task: MicroBuildInsertVsPayload@3
+    - task: MicroBuildInsertVsPayload@4
       displayName: Insert VS Payload
       inputs:
         SkipCreatePR: true

azure-pipelines/TSAOptions.json

@@ -0,0 +1,19 @@
+{
+  "tsaVersion": "TsaV2",
+  "codebase": "NewOrUpdate",
+  "codebaseName": "Microsoft.VisualStudio.Threading",
+  "tsaStamp": "DevDiv",
+  "tsaEnvironment": "PROD",
+  "notificationAliases": [
+     "vsidemicrobuild@microsoft.com"
+  ],
+  "codebaseAdmins": [
+      "REDMOND\\andarno"
+  ],
+  "instanceUrl": "https://devdiv.visualstudio.com",
+  "projectName": "DevDiv",
+  "areaPath": "DevDiv\\VS Core\\Special Projects\\vs-threading",
+  "iterationPath": "DevDiv",
+  "alltools": true,
+  "repositoryName": "vs-threading"
+}

azure-pipelines/artifacts/LocBin.ps1

@@ -1,5 +1,7 @@
 # Identify LCE files and the binary files they describe
 $BinRoot = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\..\bin")
+if (!(Test-Path $BinRoot))  { return }
+
 $FilesToCopy = @()
 $FilesToCopy += Get-ChildItem -Recurse -File -Path $BinRoot |? { $_.FullName -match '\\Localize\\' }
 

azure-pipelines/artifacts/VSInsertion.ps1

@@ -24,29 +24,36 @@ if (!(Test-Path $NuGetPackages)) {
     return @{}
 }
 
-$ArtifactBasePath = "$RepoRoot\obj\_artifacts"
-$ArtifactPath = "$ArtifactBasePath\VSInsertion"
-if (-not (Test-Path $ArtifactPath)) { New-Item -ItemType Directory -Path $ArtifactPath | Out-Null }
-
-$profilingInputs = [xml](Get-Content -Path "$PSScriptRoot\..\ProfilingInputs.props")
-$profilingInputs.Project.ItemGroup.TestStore.Include = "vstsdrop:" + (& "$PSScriptRoot\..\variables\ProfilingInputsDropName.ps1")
-$profilingInputs.Save("$ArtifactPath\ProfilingInputs.props")
-
-$InsertionMetadataVersion = $(dotnet tool run nbgv get-version -p "$RepoRoot\src" -f json | ConvertFrom-Json).NuGetPackageVersion
-if ($env:BUILD_BUILDID) {
-    # We must ensure unique versions for the insertion metadata package so
-    # it can contain information that is unique to this build.
-    # In particular it includes the ProfilingInputsDropName, which contains the BuildId.
-    # A non-unique package version here may collide with a prior run of this same commit,
-    # ultimately resulting in a failure of the optprof run.
-    $InsertionMetadataVersion += '.' + $env:BUILD_BUILDID
-}
-& (& "$PSScriptRoot\..\Get-NuGetTool.ps1") pack "$PSScriptRoot\..\InsertionMetadataPackage.nuspec" -OutputDirectory $CoreXTPackages -BasePath $ArtifactPath -Version $InsertionMetadataVersion | Out-Null
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
+$result = @{
+    "$PackagesRoot" = (Get-ChildItem $PackagesRoot -Recurse)
 }
 
-@{
-    "$NuGetPackages" = (Get-ChildItem $NuGetPackages -Recurse)
-    "$CoreXTPackages" = (Get-ChildItem "$CoreXTPackages\Microsoft.VisualStudio.Threading.VSInsertionMetadata.$InsertionMetadataVersion.nupkg");
+if ($env:IsOptProf) {
+    $CoreXTPackages = "$RepoRoot/bin/Packages/$BuildConfiguration/CoreXT"
+
+    $ArtifactBasePath = "$RepoRoot\obj\_artifacts"
+    $ArtifactPath = "$ArtifactBasePath\VSInsertion"
+    if (-not (Test-Path $ArtifactPath)) { New-Item -ItemType Directory -Path $ArtifactPath | Out-Null }
+
+    $profilingInputs = [xml](Get-Content -Path "$PSScriptRoot\..\ProfilingInputs.props")
+    $profilingInputs.Project.ItemGroup.TestStore.Include = "vstsdrop:" + (& "$PSScriptRoot\..\variables\ProfilingInputsDropName.ps1")
+    $profilingInputs.Save("$ArtifactPath\ProfilingInputs.props")
+
+    $InsertionMetadataVersion = $(dotnet tool run nbgv get-version -p "$RepoRoot\src" -f json | ConvertFrom-Json).NuGetPackageVersion
+    if ($env:BUILD_BUILDID) {
+        # We must ensure unique versions for the insertion metadata package so
+        # it can contain information that is unique to this build.
+        # In particular it includes the ProfilingInputsDropName, which contains the BuildId.
+        # A non-unique package version here may collide with a prior run of this same commit,
+        # ultimately resulting in a failure of the optprof run.
+        $InsertionMetadataVersion += '.' + $env:BUILD_BUILDID
+    }
+    & (& "$PSScriptRoot\..\Get-NuGetTool.ps1") pack "$PSScriptRoot\..\InsertionMetadataPackage.nuspec" -OutputDirectory $CoreXTPackages -BasePath $ArtifactPath -Version $InsertionMetadataVersion | Out-Null
+    if ($LASTEXITCODE -ne 0) {
+        exit $LASTEXITCODE
+    }
+
+    $result["$CoreXTPackages"] = (Get-ChildItem "$CoreXTPackages\LibraryName.VSInsertionMetadata.$InsertionMetadataVersion.nupkg");
 }
+
+$result