Revert "Move official build pipeline to OneBranch (#8319)"

This reverts commit ebe67c5.

build/AzurePipelinesTemplates/MUX-BuildDevProject-Steps.yml

@@ -2,15 +2,6 @@ parameters:
   signOutput: false
 
 steps:
-
-  - template: MUX-InstallDotNetSDK-Steps.yml
-
-  - template: MUX-InstallWindowsSDK-Steps.yml
-
-  - template: MUX-InstallNuget-Steps.yml
-
-  - template: MUX-RestorePgo-Steps.yml
-
   - template: MUX-BuildProject-Steps.yml
     parameters:
       solutionPath: MUXControls.sln

build/AzurePipelinesTemplates/MUX-BuildProject-Steps.yml

@@ -15,11 +15,41 @@ steps:
       echo parameters.buildOutputDir = '${{ parameters.buildOutputDir }}'
     displayName: 'BuildProject: Display parameters'
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core sdk'
+    inputs:
+      packageType: sdk
+      version: 3.1.415
+      installationPath: $(Agent.ToolsDirectory)/dotnet
+
+  - template: MUX-InstallWindowsSDK-Steps.yml
+
+  - template: MUX-InstallNuget-Steps.yml
+
+  # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
+  - script: |
+      "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
+      set /p _VSINSTALLDIR15=<%TEMP%\vsinstalldir.txt
+      del %TEMP%\vsinstalldir.txt
+      call "%_VSINSTALLDIR15%\Common7\Tools\VsDevCmd.bat"
+      echo VCToolsInstallDir = %VCToolsInstallDir%
+      echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
+    displayName: 'Retrieve VC tools directory'
+
   - task: CmdLine@1
     displayName: 'Display build machine environment variables'
     inputs:
       filename: 'set'
 
+  - task: powershell@2
+    displayName: 'Restore PGO database'
+    condition: eq(variables['PGOBuildMode'], 'Optimize')
+    inputs:
+      targetType: filePath
+      workingDirectory: $(Build.SourcesDirectory)\tools\MUXPGODatabase
+      filePath: $(Build.SourcesDirectory)\tools\MUXPGODatabase\restore-pgodb.ps1
+      arguments: -NuGetConfigPath $(Build.SourcesDirectory)\nuget-pgo.config
+
   - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
     displayName: 'NuGet restore ${{ parameters.solutionPath }}'
     inputs:
@@ -34,6 +64,8 @@ steps:
       vsVersion: 16.0
       platform: '$(buildPlatform)'
       configuration: '$(buildConfiguration)'
+      # Workaround for an MSBuild logging nullref - remove when https://github.com/microsoft/azure-pipelines-tasks/issues/14904 is fixed.
+      enableDefaultLogger: false
       msbuildArgs: '/restore /p:UseInsiderSDK=$(UseInsiderSDK) /p:AppxPackageDir="${{ parameters.appxPackageDir }}" /p:AppxBundle=Never /p:AppxSymbolPackageEnabled=false /binaryLogger:$(Build.SourcesDirectory)/${{ parameters.solutionPath }}.$(buildPlatform).$(buildConfiguration).binlog /p:MUXVersionBuild=$(builddate_yymm) /p:MUXVersionRevision=$(builddate_dd)$(buildrevision) /p:VCToolsInstallDir="$(VCToolsInstallDir)\" /p:PGOBuildMode=$(PGOBuildMode)'
 
   - task: PublishBuildArtifacts@1
@@ -43,6 +75,10 @@ steps:
       PathtoPublish: $(Build.SourcesDirectory)/${{ parameters.solutionPath }}.$(buildPlatform).$(buildConfiguration).binlog
       artifactName: ${{ parameters.artifactName }}
 
-  - template: MUX-SourceIndexPDBs-Steps.yml
-    parameters:
-      buildOutputDir: ${{ parameters.buildOutputDir }}
+  - task: powershell@2
+    displayName: 'Source Index PDBs'
+    inputs:
+      targetType: filePath
+      filePath: build\SourceIndexing\IndexPdbs.ps1
+      arguments: -SearchDir '${{ parameters.buildOutputDir }}\$(buildConfiguration)' -SourceRoot '$(Build.SourcesDirectory)' -recursive -Verbose -CommitId $(Build.SourceVersion)
+      errorActionPreference: silentlyContinue

build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml

@@ -89,22 +89,6 @@ jobs:
       .\test\MUXControlsReleaseTest\updateUsedNugetPackageVersion.ps1 $newVersion
     displayName: Update proj files to use candidate nupkg.
 
-  - template: MUX-InstallWindowsSDK-Steps.yml
-
-  - template: MUX-InstallNuget-Steps.yml
-
-  - template: MUX-InstallDotNetSDK-Steps.yml
-
-  # The environment variable VCToolsInstallDir isn't defined on lab machines, so we need to retrieve it ourselves.
-  - script: |
-      "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -requires Microsoft.Component.MSBuild -property InstallationPath > %TEMP%\vsinstalldir.txt
-      set /p _VSINSTALLDIR15=<%TEMP%\vsinstalldir.txt
-      del %TEMP%\vsinstalldir.txt
-      call "%_VSINSTALLDIR15%\Common7\Tools\VsDevCmd.bat"
-      echo VCToolsInstallDir = %VCToolsInstallDir%
-      echo ##vso[task.setvariable variable=VCToolsInstallDir]%VCToolsInstallDir%
-    displayName: 'Retrieve VC tools directory'
-
   - template: MUX-BuildProject-Steps.yml
     parameters:
       solutionPath: test\MUXControlsReleaseTest\RuntimeComponentThatUsesMUX\RuntimeComponentThatUsesMUX.sln

build/AzurePipelinesTemplates/MUX-RunHelixTests-Job.yml

@@ -21,8 +21,8 @@ parameters:
     Release_x64:
       buildPlatform: 'x64'
       buildConfiguration: 'release'
-      openHelixTargetQueues: 'windows.10.amd64.client.open.reunion'
-      closedHelixTargetQueues: 'windows.10.amd64.client20h2.xaml'
+      openHelixTargetQueues: 'Windows.10.Amd64.Client21H1.Open.xaml'
+      closedHelixTargetQueues: 'Windows.10.Amd64.Client21H1.xaml'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -99,7 +99,15 @@ jobs:
     parameters:
       condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
       testBinaryDirectoryPath: '$(Build.SourcesDirectory)\HelixPayload\$(buildConfiguration)\$(buildPlatform)'
-      testFilePattern: 'MUXControlsTestApp.msix'
+      testFilePattern: 'MUXExperimental.Test.dll'
+      outputProjFileName: 'RunTestsInHelix-ExperimentalInteractionTests.proj'
+      taefQuery: ${{ parameters.taefQuery }}
+
+  - template: MUX-CreateHelixProjFile-Steps.yml
+    parameters:
+      condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
+      testBinaryDirectoryPath: '$(Build.SourcesDirectory)\HelixPayload\$(buildConfiguration)\$(buildPlatform)'
+      testFilePattern: 'MUXControlsTestApp.appx'
       outputProjFileName: 'RunTestsInHelix-ApiTests.proj'
       taefQuery: ${{ parameters.taefQuery }}
 

build/CreateCBSVPack.ps1

@@ -192,4 +192,4 @@ $contentString = "This is the contents of version '$($vpackversion)' of the Micr
 Set-Content -Path $readmeFilePath -Value $contentString 
 
 # This sets a Pipeline variable that the Job will use to push the created vpacks with the specified version.
-Write-Host "##vso[task.setvariable variable=vpackversion;isOutput=true;]$vpackversion"
+Write-Host "##vso[task.setvariable variable=vpackversion]$vpackversion"

build/Helix/RunTestsInHelix.proj

@@ -13,6 +13,7 @@
 
   <!-- These .proj files are generated by the build machine prior to running tests via GenerateTestProjFile.ps1. -->
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-InteractionTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
+  <Import Project="$(ProjFilesPath)\RunTestsInHelix-ExperimentalInteractionTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-ApiTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-IXMPTestAppTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-NugetTests.proj" Condition=" '$(TestSuite)'=='NugetTestSuite' " />

build/MUX-CI.yml

@@ -9,7 +9,7 @@ jobs:
       name: WinDevPoolOSS-L
     ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-9
   timeoutInMinutes: 120
   strategy:
     maxParallel: 10

build/MUX-PGOInstrument.yml

@@ -9,7 +9,7 @@ jobs:
 - job: Build
   pool: 
     name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-9
   timeoutInMinutes: 120
   strategy:
     maxParallel: 10

build/MUX-PR.yml

@@ -27,7 +27,7 @@ jobs:
       name: WinDevPoolOSS-L
     ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-9
   timeoutInMinutes: 120
   strategy:
     maxParallel: 10

build/MUX-Release.yml

@@ -16,7 +16,7 @@ jobs:
 - job: Scanning
   pool: 
     name: WinDevPool-S
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-9
 
   steps:
 
@@ -44,7 +44,7 @@ jobs:
     eq(variables['useBuildOutputFromBuildId'],'')
   pool: 
     name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-9
   timeoutInMinutes: 120
   strategy:
     maxParallel: 10

build/MUX-SimpleBuildAndTest.yml

@@ -15,7 +15,7 @@ jobs:
       name: WinDevPoolOSS-L
     ${{ if ne(variables['System.CollectionUri'], 'https://dev.azure.com/ms/') }}:
       name: WinDevPool-L
-    demands: ImageOverride -equals WinDevVS17-latest
+    demands: ImageOverride -equals WinDevVS16-9
   timeoutInMinutes: 120
   variables:
     appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages

build/NuSpecs/build-nupkg.ps1

@@ -12,17 +12,6 @@ Param(
     [switch]$SkipFrameworkPackage
 )
 
-Write-Host "BuildOutput = '$BuildOutput'"
-Write-Host "OutputDir = '$OutputDir'"
-Write-Host "VersionOverride = '$VersionOverride'"
-Write-Host "Subversion = '$Subversion'"
-Write-Host "DateOverride = '$DateOverride'"
-Write-Host "prereleaseversion = '$prereleaseversion'"
-Write-Host "BuildFlavor = '$BuildFlavor'"
-Write-Host "BuildArch = '$BuildArch'"
-Write-Host "NoDeleteTemp = '$NoDeleteTemp'"
-Write-Host "SkipFrameworkPackage = '$SkipFrameworkPackage'"
-
 #
 # Version is read from the VERSION file.
 #
@@ -172,4 +161,40 @@ if (-not $NoDeleteTemp)
     Remove-Item -Recurse -Force "$($TempDir.FullName)"
 }
 
+$nupkgtitle = "Microsoft.Experimental.UI.Xaml"
+$TempDir = New-TemporaryDirectory
+Write-Verbose "TempDir = $($TempDir.FullName)"
+
+$runtimesDir = "$($TempDir.FullName)\runtimes"
+$toolsDir = "$($TempDir.FullName)\tools"
+
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.dll "$runtimesDir\win10-x86\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x86\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.pri "$runtimesDir\win10-x86\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.dll "$runtimesDir\win10-x64\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\x64\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.pri "$runtimesDir\win10-x64\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.dll "$runtimesDir\win10-arm\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.pri "$runtimesDir\win10-arm\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.dll "$runtimesDir\win10-arm64\native"
+Copy-IntoNewDirectory -IfExists $BuildOutput\$BuildFlavor\arm64\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.pri "$runtimesDir\win10-arm64\native"
+
+
+$CommonNugetArgs = "-properties `"BuildOutput=$BuildOutput``;ID=$nupkgtitle``;RUNTIMESDIR=$runtimesDir`;TOOLSDIR=$toolsDir`;BUILDFLAVOR=$($BuildFlavor)`;BUILDARCH=$($BuildArch)`""
+
+$NugetArgs = "$CommonNugetArgs -OutputDirectory $OutputDir"
+
+$nugetExe = "$scriptDirectory\..\..\tools\NugetWrapper.cmd"
+$NugetCmdLine = "$nugetExe pack Microsoft.Experimental.UI.Xaml.nuspec $NugetArgs -version $version"
+Write-Host $NugetCmdLine
+Invoke-Expression $NugetCmdLine
+if ($lastexitcode -ne 0)
+{
+    Write-Host "Nuget returned $lastexitcode"
+    Exit $lastexitcode; 
+}
+
+if (-not $NoDeleteTemp)
+{
+    Remove-Item -Recurse -Force "$($TempDir.FullName)"
+}
+
 popd

build/SourceIndexing/IndexPdbs.ps1

@@ -8,27 +8,10 @@ Param(
     [switch]$recursive
 )
 
-
-$repoRoot = Join-Path (Split-Path -Parent $script:MyInvocation.MyCommand.Path) "..\..\"
-$pdbstrExe = Join-Path $repoRoot "packages\Microsoft.Debugging.Tools.PdbStr.20230202.1638.0\content\amd64\pdbstr.exe"
-$srctoolExe = Join-Path $repoRoot "packages\Microsoft.Debugging.Tools.SrcTool.20230202.1638.0\content\amd64\srctool.exe"
-
-Write-Host "srctoolExe = $srctoolExe"
-Write-Host "pdbstrExe = $pdbstrExe"
-
-if(!(Test-Path $srctoolExe))
-{
-    Write-Error "Not found: $srctoolExe"
-    Write-Error "Make sure to run nuget restore before running script"
-    return -1
-}
-
-if(!(Test-Path $pdbstrExe))
-{
-    Write-Error "Not found: $pdbstrExe"
-    Write-Error "Make sure to run nuget restore before running script"
-    return -1
-}
+$debuggerPath = (Get-ItemProperty -path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots" -name WindowsDebuggersRoot10).WindowsDebuggersRoot10
+$srcsrvPath = Join-Path $debuggerPath "x64\srcsrv"
+$srctoolExe = Join-Path $srcsrvPath "srctool.exe"
+$pdbstrExe = Join-Path $srcsrvPath "pdbstr.exe"
 
 $fileTable = @{}
 foreach ($gitFile in & git ls-files)