From ae39ec9bb12b3a0d33cf296d52dd4dc26ed21093 Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Mon, 30 Jan 2023 13:30:43 -0800
Subject: [PATCH 1/9] Exported classic pipeline to YAML

---
 .pipelines/build.yml | 665 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 665 insertions(+)
 create mode 100644 .pipelines/build.yml

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
new file mode 100644
index 000000000..280c42258
--- /dev/null
+++ b/.pipelines/build.yml
@@ -0,0 +1,665 @@
+# 'Allow scripts to access the OAuth token' was selected in pipeline.  Add the following YAML to any steps requiring access:
+#       env:
+#           MY_ACCESS_TOKEN: $(System.AccessToken)
+# Variable 'MajorVersion' was defined in the Variables tab
+# Variable 'MinorVersion' was defined in the Variables tab
+# Cron Schedules have been converted using UTC Time Zone and may need to be updated for your location
+# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
+# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
+# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
+# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
+# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
+# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
+trigger:
+  branches:
+    include:
+    - refs/heads/master
+  batch: True
+schedules:
+- cron: 0 2 * * *
+  branches:
+    include:
+    - refs/heads/master
+name: $(MajorVersion).$(MinorVersion).$(date:yyMMdd)$(rev:.r)
+jobs:
+- job: Job_1
+  displayName: Build Binaries
+  pool:
+    name: Azure Pipelines
+    demands:
+    - msbuild
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: false
+    persistCredentials: True
+  - task: NuGetToolInstaller@1
+    displayName: Use NuGet 6.0.2
+    continueOnError: True
+    inputs:
+      versionSpec: 6.0.2
+  - task: NuGetCommand@2
+    displayName: NuGet restore
+  - task: CmdLine@2
+    displayName: Build Tools
+    inputs:
+      script: >-
+        if "%VSCMD_VER%"=="" (
+            pushd c:
+            call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" >nul 2>&1
+            popd
+        )
+
+
+        build_test_all.cmd $(BuildPlatform) $(BuildConfiguration) $(Build.BuildNumber) true
+      failOnStderr: true
+  - task: ComponentGovernanceComponentDetection@0
+    displayName: Component Detection
+    condition: eq(variables['BuildPlatform'], 'x64')
+  - task: PublishTestResults@2
+    displayName: Publish Test Results
+    enabled: False
+  - task: CopyFiles@2
+    displayName: Stage cppwinrt.*
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
+      Contents: >-
+        cppwinrt.exe
+
+        cppwinrt.pdb
+      TargetFolder: $(Build.ArtifactStagingDirectory)\cppwinrt
+  - task: CopyFiles@2
+    displayName: Stage Component cppwinrtvisualizer.*
+    condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: '$(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Component '
+      Contents: >
+        cppwinrtvisualizer.dll
+
+        cppwinrtvisualizer.pdb
+
+        cppwinrtvisualizer.vsdconfig
+      TargetFolder: $(Build.ArtifactStagingDirectory)\Component
+  - task: CopyFiles@2
+    displayName: Stage Standalone cppwinrtvisualizer.*
+    condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Standalone
+      Contents: >
+        cppwinrtvisualizer.dll
+
+        cppwinrtvisualizer.pdb
+
+        cppwinrtvisualizer.vsdconfig
+      TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone
+  - task: CopyFiles@2
+    displayName: Stage cppwinrt_fast_forwarder.lib
+    condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
+      Contents: cppwinrt_fast_forwarder.lib
+      TargetFolder: $(Build.ArtifactStagingDirectory)
+  - task: ManifestGeneratorTask@0
+    displayName: 'Manifest Generator '
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      BuildDropPath: $(Build.ArtifactStagingDirectory)\cppwinrt
+  - task: PublishPipelineArtifact@0
+    displayName: Publish Artifacts
+    condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_$(BuildPlatform)
+      targetPath: $(Build.ArtifactStagingDirectory)
+  - task: PublishSymbols@2
+    displayName: Publish symbols
+    condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SymbolsFolder: $(Build.ArtifactStagingDirectory)
+      SearchPattern: '**/*.pdb'
+      IndexSources: false
+      SymbolServerType: TeamServices
+      SymbolsProduct: CppWinRT
+- job: Job_2
+  displayName: Build Internal Packages (VPacks)
+  dependsOn: Job_1
+  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'))
+  pool:
+    name: Azure Pipelines
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: false
+    persistCredentials: True
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      branchVersionExcludeBranch: master
+      disableWorkspace: true
+      disableMsbuildVersion: true
+      disableBuildTools: true
+  - task: DownloadPipelineArtifact@1
+    displayName: Download x86 Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_x86
+      downloadPath: $(Build.SourcesDirectory)\x86
+  - task: DownloadPipelineArtifact@1
+    displayName: Download x64 Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_x64
+      downloadPath: $(Build.SourcesDirectory)\x64
+  - task: DownloadPipelineArtifact@1
+    displayName: Download arm Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_arm
+      downloadPath: $(Build.SourcesDirectory)\arm
+  - task: DownloadPipelineArtifact@1
+    displayName: Download arm64 Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_arm64
+      downloadPath: $(Build.SourcesDirectory)\arm64
+  - task: CmdLine@2
+    displayName: Parse PatchVersion
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: 'for /f "tokens=3,4 delims=." %%i in ("$(Build.BuildNumber)") do @echo ##vso[task.setvariable variable=PatchVersion;]%%i%%j '
+      failOnStderr: true
+  - task: CmdLine@2
+    displayName: Copy compiler contents for internal signing
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: >
+        md $(Build.SourcesDirectory)\x86\tempsign
+
+
+        echo Build Sources Directory:
+
+        dir $(Build.SourcesDirectory)
+
+
+        echo x86
+
+        dir $(Build.SourcesDirectory)\x86
+
+
+        echo cppwinrt
+
+        dir $(Build.SourcesDirectory)\x86\cppwinrt
+
+
+        xcopy $(Build.SourcesDirectory)\x86\cppwinrt\*.* $(Build.SourcesDirectory)\x86\tempsign /icefzy
+  - task: EsrpCodeSigning@1
+    displayName: Sign Compiler vPack for internal use
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      ConnectedServiceName: bf601a97-455d-4977-b248-07b90c96eed9
+      FolderPath: $(Build.SourcesDirectory)\x86\tempsign
+      signConfigType: inlineSignParams
+      inlineOperation: >-
+        [
+            {
+                "KeyCode" : "CP-458204",
+                "OperationCode" : "SigntoolSign",
+                "Parameters" : {
+                "OpusName" : "Windows Build Tools Internal",
+                "OpusInfo" : "http://www.microsoft.com",
+                "FileDigest" : "/fd \"SHA256\"",
+                "PageHash" : "/NPH",
+                "TimeStamp" : "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            },
+                "ToolName" : "sign",
+                "ToolVersion" : "1.0"
+            },
+            {
+                "KeyCode" : "CP-458204",
+                "OperationCode" : "SigntoolVerify",
+                "Parameters" : {},
+                "ToolName" : "sign",
+                "ToolVersion" : "1.0"
+            }
+        ]
+  - task: PkgESVPack@12
+    displayName: 'Publish Compiler VPack '
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      serviceType: drop
+      versionAs: parts
+      sourceDirectory: $(Build.SourcesDirectory)\x86\tempsign
+      description: C++/WinRT Compiler
+      pushPkgName: CppWinRT.Compiler
+      target: $(OSBuildToolsRoot)\cppwinrt
+      provData: false
+      majorVer: $(MajorVersion)
+      minorVer: $(MinorVersion)
+      patchVer: $(PatchVersion)
+      prereleaseVer: $(Build.SourceBranchName).$(BuildPlatform).$(BuildConfiguration).$(Build.BuildNumber).$(Build.SourceVersion)
+      signSbom: false
+  - task: CmdLine@2
+    displayName: Delete internal compiler copy
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: >+
+        rd $(Build.SourcesDirectory)\x86\tempsign /q /s
+
+  - task: CopyFiles@2
+    displayName: Stage CppWinRT.Compiler.man
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(XES_VPACKMANIFESTDIRECTORY)
+      Contents: $(XES_VPACKMANIFESTNAME)
+      TargetFolder: $(Build.ArtifactStagingDirectory)
+  - task: CmdLine@2
+    displayName: Stage MSBuild vpack
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: "set TargetDir=$(Build.SourcesDirectory)\\msbuild\nrd /s /q %TargetDir% >nul 2>&1\nmd %TargetDir%\ncd %TargetDir%\n\ncopy $(Build.SourcesDirectory)\\vsix\\Microsoft.Cpp.CppWinRT.props\ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.props Microsoft.Cpp.CppWinRTEnabled.props \ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.targets Microsoft.Cpp.CppWinRTEnabled.targets\ncopy $(Build.SourcesDirectory)\\nuget\\CppWinrtRules.Project.xml CppWinrtRules.Project.xml\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\i386\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\Win32\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\amd64\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\x64\necho d | xcopy $(Build.SourcesDirectory)\\arm\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm\necho d | xcopy $(Build.SourcesDirectory)\\arm64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm64\n"
+      failOnStderr: true
+  - task: PkgESVPack@12
+    displayName: Publish MSBuild VPack
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      serviceType: drop
+      versionAs: parts
+      sourceDirectory: $(Build.SourcesDirectory)\msbuild
+      description: C++/WinRT MSBuild
+      pushPkgName: CppWinRT.MSBuild
+      target: $(OSBuildToolsRoot)\cppwinrt
+      provData: false
+      majorVer: $(MajorVersion)
+      minorVer: $(MinorVersion)
+      patchVer: $(PatchVersion)
+      prereleaseVer: $(Build.SourceBranchName).$(Build.BuildNumber).$(Build.SourceVersion)
+      signSbom: false
+  - task: CopyFiles@2
+    displayName: Stage CppWinRT.MSBuild.man
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(XES_VPACKMANIFESTDIRECTORY)
+      Contents: $(XES_VPACKMANIFESTNAME)
+      TargetFolder: $(Build.ArtifactStagingDirectory)
+  - task: CmdLine@2
+    displayName: Stage OSBuildTools.Manifest Update
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    enabled: False
+    inputs:
+      script: >-
+        copy $(Build.SourcesDirectory)\src\package\cppwinrt\vpack\GitCheckin.json
+
+        copy $(Build.SourcesDirectory)\vpack\*.man OSBuildTools.Manifest.Update
+
+        type OSBuildTools.Manifest.Update
+      workingDirectory: $(Build.ArtifactStagingDirectory)
+      failOnStderr: true
+  - task: PublishPipelineArtifact@0
+    displayName: Publish Update Manifests
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: VPack
+      targetPath: $(Build.ArtifactStagingDirectory)
+- job: Phase_1
+  displayName: Build External Packages (NuGet, VSIX)
+  cancelTimeoutInMinutes: 1
+  dependsOn: Job_1
+  pool:
+    name: Azure Pipelines
+  steps:
+  - checkout: self
+    clean: true
+    fetchTags: false
+    persistCredentials: True
+  - task: NuGetToolInstaller@1
+    displayName: Use NuGet 6.0.2
+    continueOnError: True
+    inputs:
+      versionSpec: 6.0.2
+  - task: NuGetCommand@2
+    displayName: NuGet restore
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+  - task: DownloadPipelineArtifact@1
+    displayName: Download x86 Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_x86
+      downloadPath: $(Build.SourcesDirectory)\x86
+  - task: DownloadPipelineArtifact@1
+    displayName: Download x64 Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_x64
+      downloadPath: $(Build.SourcesDirectory)\x64
+  - task: DownloadPipelineArtifact@1
+    displayName: Download arm Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_arm
+      downloadPath: $(Build.SourcesDirectory)\arm
+  - task: DownloadPipelineArtifact@1
+    displayName: Download arm64 Artifacts
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: $(BuildConfiguration)_arm64
+      downloadPath: $(Build.SourcesDirectory)\arm64
+  - task: EsrpCodeSigning@1
+    displayName: ESRP CodeSigning NatVis
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+      FolderPath: $(Build.SourcesDirectory)
+      Pattern: >-
+        x86\cppwinrt\cppwinrt.exe
+
+        x86\Component\cppwinrtvisualizer.dll
+
+        x64\Component\cppwinrtvisualizer.dll
+
+        arm64\Component\cppwinrtvisualizer.dll
+
+        x86\Standalone\cppwinrtvisualizer.dll
+
+        x64\Standalone\cppwinrtvisualizer.dll
+      UseMinimatch: true
+      signConfigType: inlineSignParams
+      inlineOperation: >-
+        [
+          {
+            "keyCode": "CP-230012",
+            "operationSetCode": "SigntoolSign",
+            "parameters": [
+              {
+                "parameterName": "OpusName",
+                "parameterValue": "Microsoft"
+              },
+              {
+                "parameterName": "OpusInfo",
+                "parameterValue": "http://www.microsoft.com"
+              },
+              {
+                "parameterName": "PageHash",
+                "parameterValue": "/NPH"
+              },
+              {
+                "parameterName": "FileDigest",
+                "parameterValue": "/fd sha256"
+              },
+              {
+                "parameterName": "TimeStamp",
+                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+              }
+            ],
+            "toolName": "signtool.exe",
+            "toolVersion": "6.2.9304.0"
+          }
+        ]
+  - task: CmdLine@2
+    displayName: Stage Signed Binaries
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: >-
+        echo F|xcopy /S /Q /Y /F x86\cppwinrt\cppwinrt.exe $(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe
+
+        echo F|xcopy /S /Q /Y /F  x86\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x86\Component\cppwinrtvisualizer.dll
+
+        echo F|xcopy /S /Q /Y /F  x64\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x64\Component\cppwinrtvisualizer.dll
+
+        echo F|xcopy /S /Q /Y /F  arm64\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\arm64\Component\cppwinrtvisualizer.dll
+
+        echo F|xcopy /S /Q /Y /F  x86\Standalone\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x86\Standalone\cppwinrtvisualizer.dll
+
+        echo F|xcopy /S /Q /Y /F  x64\Standalone\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x64\Standalone\cppwinrtvisualizer.dll
+
+        echo F|xcopy /S /Q /Y /F  arm64\Standalone\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\arm64\Standalone\cppwinrtvisualizer.dll
+      workingDirectory: $(Build.SourcesDirectory)
+      failOnStderr: true
+  - task: CmdLine@2
+    displayName: Stage cppwinrtvisualizer.vsdconfig
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: >-
+        copy $(Build.SourcesDirectory)\x86\Component\cppwinrtvisualizer.vsdconfig x86\Component\cppwinrtvisualizer.vsdconfig
+
+        copy $(Build.SourcesDirectory)\x86\Standalone\cppwinrtvisualizer.vsdconfig x86\Standalone\cppwinrtvisualizer.vsdconfig
+      workingDirectory: $(Build.ArtifactStagingDirectory)
+      failOnStderr: true
+  - task: NuGetCommand@2
+    displayName: Build NuGet
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      command: pack
+      searchPatternPack: nuget/Microsoft.Windows.CppWinRT.nuspec
+      versioningScheme: byBuildNumber
+      buildProperties: 'cppwinrt_exe=$(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=$(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib '
+  - task: ComponentGovernanceComponentDetection@0
+    displayName: Component Detection
+  - task: EsrpCodeSigning@1
+    displayName: ESRP CodeSigning Nuget Package
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+      FolderPath: $(Build.ArtifactStagingDirectory)
+      Pattern: Microsoft.Windows.CppWinRT.*.nupkg
+      UseMinimatch: true
+      signConfigType: inlineSignParams
+      inlineOperation: >-
+        [
+          {
+            "KeyCode" : "CP-401405",
+            "OperationCode" : "NuGetSign",
+            "Parameters" : {},
+            "ToolName" : "sign",
+            "ToolVersion" : "1.0"
+          },
+          {
+              "KeyCode" : "CP-401405",
+              "OperationCode" : "NuGetVerify",
+              "Parameters" : {},
+              "ToolName" : "sign",
+              "ToolVersion" : "1.0"
+          }
+        ]
+  - task: PkgESNuGetPublisher@0
+    displayName: Publish NuGet Package
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      searchPattern: $(System.ArtifactsDirectory)\Microsoft.Windows.CppWinRT.$(Build.BuildNumber).nupkg
+      nuGetFeedType: internal
+      feedName: https://microsoft.pkgs.visualstudio.com/_packaging/CppWinRT/nuget/v3/index.json
+  - task: VSBuild@1
+    displayName: Build Component VSIXes
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      solution: vsix/vsix.sln
+      msbuildArgs: /p:Deployment=Component,CppWinRTVersion=$(Build.BuildNumber),NatvisDirx86=$(Build.ArtifactStagingDirectory)\x86\Component\,NatvisDirx64=$(Build.ArtifactStagingDirectory)\x64\Component\,NatvisDirarm64=$(Build.ArtifactStagingDirectory)\arm64\Component\,NupkgDir=$(Build.ArtifactStagingDirectory) /restore
+      platform: Any CPU
+      configuration: Release
+  - task: ExtractFiles@1
+    displayName: Extract Component VSIX files for signing
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      archiveFilePatterns: $(Build.SourcesDirectory)\vsix\Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
+      destinationFolder: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
+      overwriteExistingFiles: true
+  - task: EsrpCodeSigning@1
+    displayName: ESRP CodeSign VSIX contents
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+      FolderPath: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
+      Pattern: '**/Microsoft.Windows.CppWinRT.*.dll'
+      UseMinimatch: true
+      signConfigType: inlineSignParams
+      inlineOperation: >-
+        [
+          {
+            "keyCode": "CP-230012",
+            "operationSetCode": "SigntoolSign",
+            "parameters": [
+              {
+                "parameterName": "OpusName",
+                "parameterValue": "Microsoft"
+              },
+              {
+                "parameterName": "OpusInfo",
+                "parameterValue": "http://www.microsoft.com"
+              },
+              {
+                "parameterName": "PageHash",
+                "parameterValue": "/NPH"
+              },
+              {
+                "parameterName": "FileDigest",
+                "parameterValue": "/fd sha256"
+              },
+              {
+                "parameterName": "TimeStamp",
+                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+              }
+            ],
+            "toolName": "signtool.exe",
+            "toolVersion": "6.2.9304.0"
+          }
+        ]
+  - task: ArchiveFiles@2
+    displayName: Repack signed VSIX contents
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      rootFolderOrFile: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
+      includeRootFolder: false
+      archiveFile: $(Build.SourcesDirectory)\vsix\Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
+  - task: VSBuild@1
+    displayName: Build Standalone VSIXes
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      solution: vsix/vsix.sln
+      msbuildArgs: /p:Deployment=Standalone,CppWinRTVersion=$(Build.BuildNumber),NatvisDirx86=$(Build.ArtifactStagingDirectory)\x86\Standalone\,NatvisDirx64=$(Build.ArtifactStagingDirectory)\x64\Standalone\,NatvisDirarm64=$(Build.ArtifactStagingDirectory)\arm64\Standalone\,NupkgDir=$(Build.ArtifactStagingDirectory) /restore
+      platform: x86
+      configuration: Release
+  - task: EsrpCodeSigning@1
+    displayName: ESRP CodeSigning VSIX
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
+      FolderPath: $(Build.SourcesDirectory)\vsix\
+      Pattern: >-
+        Dev16\bin\Release\Component\Microsoft.Windows.CppWinRT.vsix
+
+        Dev16\bin\Release\Standalone\Microsoft.Windows.CppWinRT.vsix
+
+        Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
+
+        Dev17\bin\Release\Standalone\Microsoft.Windows.CppWinRT.Dev17.vsix
+      UseMinimatch: true
+      signConfigType: inlineSignParams
+      inlineOperation: >
+        [
+                {
+                    "KeyCode" : "CP-233016",
+                    "OperationCode" : "OpcSign",
+                    "Parameters" : {
+                        "FileDigest" : "/fd SHA256"
+                    },
+                    "ToolName" : "sign",
+                    "ToolVersion" : "1.0"
+                },
+                {
+                    "KeyCode" : "CP-233016",
+                    "OperationCode" : "OpcVerify",
+                    "Parameters" : {},
+                    "ToolName" : "sign",
+                    "ToolVersion" : "1.0"
+                }
+        ]
+  - task: CmdLine@2
+    displayName: Stage Component VSIX (Dev17)
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: >-
+        echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.vsix $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.vsix
+
+        echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.json $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.json
+
+        echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.pdb $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.pdb
+      workingDirectory: $(Build.SourcesDirectory)\vsix\Dev17\bin\Release\Component
+      failOnStderr: true
+  - task: CopyFiles@2
+    displayName: Stage Component VSIX Manifest (Dev17)
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(Build.SourcesDirectory)\vsix
+      Contents: >-
+        extension.manifest.json
+
+        overview.md
+      TargetFolder: $(Build.ArtifactStagingDirectory)\Component\Dev17
+      OverWrite: true
+  - task: CmdLine@2
+    displayName: Stage Standalone VSIX (Dev16)
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.vsix $(Build.ArtifactStagingDirectory)\Standalone\Dev16\Microsoft.Windows.CppWinRT.vsix
+      workingDirectory: $(Build.SourcesDirectory)\vsix\Dev16\bin\$(BuildConfiguration)\Standalone
+      failOnStderr: true
+  - task: CopyFiles@2
+    displayName: Stage Standalone VSIX Manifest (Dev16)
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(Build.SourcesDirectory)\vsix
+      Contents: >-
+        extension.manifest.json
+
+        overview.md
+      TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone\Dev16
+      OverWrite: true
+  - task: CmdLine@2
+    displayName: Stage Standalone VSIX (Dev17)
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      script: echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.vsix $(Build.ArtifactStagingDirectory)\Standalone\Dev17\Microsoft.Windows.CppWinRT.Dev17.vsix
+      workingDirectory: $(Build.SourcesDirectory)\vsix\Dev17\bin\$(BuildConfiguration)\Standalone
+      failOnStderr: true
+  - task: CopyFiles@2
+    displayName: Stage Standalone VSIX Manifest (Dev17)
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SourceFolder: $(Build.SourcesDirectory)\vsix
+      Contents: >-
+        extension.manifest.json
+
+        overview.md
+      TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone\Dev17
+      OverWrite: true
+  - task: ManifestGeneratorTask@0
+    displayName: SBOM for Dev16
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      BuildDropPath: $(Build.ArtifactStagingDirectory)\Standalone\Dev16
+  - task: ManifestGeneratorTask@0
+    displayName: SBOM for Dev17 Standalone
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      BuildDropPath: $(Build.ArtifactStagingDirectory)\Standalone\Dev17
+  - task: ManifestGeneratorTask@0
+    displayName: SBOM for Dev17 Component
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      BuildDropPath: $(Build.ArtifactStagingDirectory)\Component\Dev17
+  - task: PublishPipelineArtifact@0
+    displayName: Publish VSIX
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      artifactName: Publish
+      targetPath: $(Build.ArtifactStagingDirectory)
+  - task: PublishSymbols@2
+    displayName: Publish Component VSIX symbols
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    inputs:
+      SymbolsFolder: $(Build.ArtifactStagingDirectory)
+      SearchPattern: '**/Microsoft.Windows.CppWinRT.Dev17.pdb'
+      IndexSources: false
+      SymbolServerType: TeamServices
+      SymbolsProduct: CppWinRT
+...

From 2651383322ac932803ce6908c1b629ef23028873 Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Mon, 30 Jan 2023 17:59:33 -0800
Subject: [PATCH 2/9] Cleanup

---
 .pipelines/build.yml | 173 ++++++++++++++++++++-----------------------
 1 file changed, 80 insertions(+), 93 deletions(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index 280c42258..e5cf5a3e0 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -3,43 +3,48 @@
 #           MY_ACCESS_TOKEN: $(System.AccessToken)
 # Variable 'MajorVersion' was defined in the Variables tab
 # Variable 'MinorVersion' was defined in the Variables tab
-# Cron Schedules have been converted using UTC Time Zone and may need to be updated for your location
-# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
-# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
-# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
-# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
-# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
-# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
 trigger:
   branches:
     include:
     - refs/heads/master
   batch: True
 schedules:
-- cron: 0 2 * * *
+- cron: 0 18 * * *
   branches:
     include:
     - refs/heads/master
 name: $(MajorVersion).$(MinorVersion).$(date:yyMMdd)$(rev:.r)
 jobs:
-- job: Job_1
-  displayName: Build Binaries
+- job: BuildBinaries
   pool:
     name: Azure Pipelines
+    vmImage: 'windows-2022'
     demands:
     - msbuild
+  strategy:
+    matrix:
+      x86:
+        buildPlatform: 'x86'
+      x64:
+        buildPlatform: 'x64'
+      arm:
+        buildPlatform: 'arm'
+      arm64:
+        buildPlatform: 'arm64'
   steps:
   - checkout: self
     clean: true
-    fetchTags: false
     persistCredentials: True
+
   - task: NuGetToolInstaller@1
     displayName: Use NuGet 6.0.2
     continueOnError: True
     inputs:
       versionSpec: 6.0.2
   - task: NuGetCommand@2
+
     displayName: NuGet restore
+
   - task: CmdLine@2
     displayName: Build Tools
     inputs:
@@ -50,15 +55,17 @@ jobs:
             popd
         )
 
-
         build_test_all.cmd $(BuildPlatform) $(BuildConfiguration) $(Build.BuildNumber) true
       failOnStderr: true
+
   - task: ComponentGovernanceComponentDetection@0
     displayName: Component Detection
     condition: eq(variables['BuildPlatform'], 'x64')
+
   - task: PublishTestResults@2
     displayName: Publish Test Results
     enabled: False
+
   - task: CopyFiles@2
     displayName: Stage cppwinrt.*
     condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
@@ -66,9 +73,9 @@ jobs:
       SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
       Contents: >-
         cppwinrt.exe
-
         cppwinrt.pdb
       TargetFolder: $(Build.ArtifactStagingDirectory)\cppwinrt
+
   - task: CopyFiles@2
     displayName: Stage Component cppwinrtvisualizer.*
     condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
@@ -76,11 +83,10 @@ jobs:
       SourceFolder: '$(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Component '
       Contents: >
         cppwinrtvisualizer.dll
-
         cppwinrtvisualizer.pdb
-
         cppwinrtvisualizer.vsdconfig
       TargetFolder: $(Build.ArtifactStagingDirectory)\Component
+
   - task: CopyFiles@2
     displayName: Stage Standalone cppwinrtvisualizer.*
     condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
@@ -88,11 +94,10 @@ jobs:
       SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Standalone
       Contents: >
         cppwinrtvisualizer.dll
-
         cppwinrtvisualizer.pdb
-
         cppwinrtvisualizer.vsdconfig
       TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone
+
   - task: CopyFiles@2
     displayName: Stage cppwinrt_fast_forwarder.lib
     condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
@@ -100,17 +105,20 @@ jobs:
       SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
       Contents: cppwinrt_fast_forwarder.lib
       TargetFolder: $(Build.ArtifactStagingDirectory)
+
   - task: ManifestGeneratorTask@0
     displayName: 'Manifest Generator '
     condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)\cppwinrt
+
   - task: PublishPipelineArtifact@0
     displayName: Publish Artifacts
     condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_$(BuildPlatform)
       targetPath: $(Build.ArtifactStagingDirectory)
+
   - task: PublishSymbols@2
     displayName: Publish symbols
     condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
@@ -120,82 +128,77 @@ jobs:
       IndexSources: false
       SymbolServerType: TeamServices
       SymbolsProduct: CppWinRT
-- job: Job_2
+
+- job: BuildInternal
   displayName: Build Internal Packages (VPacks)
-  dependsOn: Job_1
-  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'))
+  dependsOn: BuildBinaries
+  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual')))
   pool:
     name: Azure Pipelines
+    vmImage: 'windows-2022'
   steps:
   - checkout: self
     clean: true
     fetchTags: false
     persistCredentials: True
+
   - task: PkgESSetupBuild@12
     displayName: Package ES - Setup Build
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       branchVersionExcludeBranch: master
       disableWorkspace: true
       disableMsbuildVersion: true
       disableBuildTools: true
+
   - task: DownloadPipelineArtifact@1
     displayName: Download x86 Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_x86
       downloadPath: $(Build.SourcesDirectory)\x86
+
   - task: DownloadPipelineArtifact@1
     displayName: Download x64 Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_x64
       downloadPath: $(Build.SourcesDirectory)\x64
+
   - task: DownloadPipelineArtifact@1
     displayName: Download arm Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_arm
       downloadPath: $(Build.SourcesDirectory)\arm
+
   - task: DownloadPipelineArtifact@1
     displayName: Download arm64 Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_arm64
       downloadPath: $(Build.SourcesDirectory)\arm64
+
   - task: CmdLine@2
     displayName: Parse PatchVersion
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: 'for /f "tokens=3,4 delims=." %%i in ("$(Build.BuildNumber)") do @echo ##vso[task.setvariable variable=PatchVersion;]%%i%%j '
       failOnStderr: true
+
   - task: CmdLine@2
     displayName: Copy compiler contents for internal signing
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: >
         md $(Build.SourcesDirectory)\x86\tempsign
 
-
         echo Build Sources Directory:
-
         dir $(Build.SourcesDirectory)
 
-
         echo x86
-
         dir $(Build.SourcesDirectory)\x86
 
-
         echo cppwinrt
-
         dir $(Build.SourcesDirectory)\x86\cppwinrt
 
-
         xcopy $(Build.SourcesDirectory)\x86\cppwinrt\*.* $(Build.SourcesDirectory)\x86\tempsign /icefzy
+
   - task: EsrpCodeSigning@1
     displayName: Sign Compiler vPack for internal use
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       ConnectedServiceName: bf601a97-455d-4977-b248-07b90c96eed9
       FolderPath: $(Build.SourcesDirectory)\x86\tempsign
@@ -223,9 +226,9 @@ jobs:
                 "ToolVersion" : "1.0"
             }
         ]
+
   - task: PkgESVPack@12
     displayName: 'Publish Compiler VPack '
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       serviceType: drop
       versionAs: parts
@@ -237,31 +240,30 @@ jobs:
       majorVer: $(MajorVersion)
       minorVer: $(MinorVersion)
       patchVer: $(PatchVersion)
-      prereleaseVer: $(Build.SourceBranchName).$(BuildPlatform).$(BuildConfiguration).$(Build.BuildNumber).$(Build.SourceVersion)
+      prereleaseVer: $(Build.SourceBranchName).x86.$(BuildConfiguration).$(Build.BuildNumber).$(Build.SourceVersion)
       signSbom: false
+
   - task: CmdLine@2
     displayName: Delete internal compiler copy
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: >+
         rd $(Build.SourcesDirectory)\x86\tempsign /q /s
 
   - task: CopyFiles@2
     displayName: Stage CppWinRT.Compiler.man
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(XES_VPACKMANIFESTDIRECTORY)
       Contents: $(XES_VPACKMANIFESTNAME)
       TargetFolder: $(Build.ArtifactStagingDirectory)
+
   - task: CmdLine@2
     displayName: Stage MSBuild vpack
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: "set TargetDir=$(Build.SourcesDirectory)\\msbuild\nrd /s /q %TargetDir% >nul 2>&1\nmd %TargetDir%\ncd %TargetDir%\n\ncopy $(Build.SourcesDirectory)\\vsix\\Microsoft.Cpp.CppWinRT.props\ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.props Microsoft.Cpp.CppWinRTEnabled.props \ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.targets Microsoft.Cpp.CppWinRTEnabled.targets\ncopy $(Build.SourcesDirectory)\\nuget\\CppWinrtRules.Project.xml CppWinrtRules.Project.xml\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\i386\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\Win32\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\amd64\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\x64\necho d | xcopy $(Build.SourcesDirectory)\\arm\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm\necho d | xcopy $(Build.SourcesDirectory)\\arm64\\cppwinrt_fast_forwarder.lib  build\\native\\lib\\arm64\n"
       failOnStderr: true
+
   - task: PkgESVPack@12
     displayName: Publish MSBuild VPack
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       serviceType: drop
       versionAs: parts
@@ -275,16 +277,16 @@ jobs:
       patchVer: $(PatchVersion)
       prereleaseVer: $(Build.SourceBranchName).$(Build.BuildNumber).$(Build.SourceVersion)
       signSbom: false
+
   - task: CopyFiles@2
     displayName: Stage CppWinRT.MSBuild.man
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(XES_VPACKMANIFESTDIRECTORY)
       Contents: $(XES_VPACKMANIFESTNAME)
       TargetFolder: $(Build.ArtifactStagingDirectory)
+
   - task: CmdLine@2
     displayName: Stage OSBuildTools.Manifest Update
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     enabled: False
     inputs:
       script: >-
@@ -295,72 +297,71 @@ jobs:
         type OSBuildTools.Manifest.Update
       workingDirectory: $(Build.ArtifactStagingDirectory)
       failOnStderr: true
+
   - task: PublishPipelineArtifact@0
     displayName: Publish Update Manifests
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: VPack
       targetPath: $(Build.ArtifactStagingDirectory)
-- job: Phase_1
+
+- job: BuildExternal
   displayName: Build External Packages (NuGet, VSIX)
   cancelTimeoutInMinutes: 1
-  dependsOn: Job_1
+  dependsOn: BuildBinaries
+  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual')))
   pool:
     name: Azure Pipelines
+    vmImage: 'windows-2022'
   steps:
   - checkout: self
     clean: true
     fetchTags: false
     persistCredentials: True
+
   - task: NuGetToolInstaller@1
     displayName: Use NuGet 6.0.2
     continueOnError: True
     inputs:
       versionSpec: 6.0.2
+
   - task: NuGetCommand@2
     displayName: NuGet restore
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+
   - task: DownloadPipelineArtifact@1
     displayName: Download x86 Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_x86
       downloadPath: $(Build.SourcesDirectory)\x86
+
   - task: DownloadPipelineArtifact@1
     displayName: Download x64 Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_x64
       downloadPath: $(Build.SourcesDirectory)\x64
+
   - task: DownloadPipelineArtifact@1
     displayName: Download arm Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_arm
       downloadPath: $(Build.SourcesDirectory)\arm
+
   - task: DownloadPipelineArtifact@1
     displayName: Download arm64 Artifacts
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: $(BuildConfiguration)_arm64
       downloadPath: $(Build.SourcesDirectory)\arm64
+
   - task: EsrpCodeSigning@1
     displayName: ESRP CodeSigning NatVis
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
       FolderPath: $(Build.SourcesDirectory)
       Pattern: >-
         x86\cppwinrt\cppwinrt.exe
-
         x86\Component\cppwinrtvisualizer.dll
-
         x64\Component\cppwinrtvisualizer.dll
-
         arm64\Component\cppwinrtvisualizer.dll
-
         x86\Standalone\cppwinrtvisualizer.dll
-
         x64\Standalone\cppwinrtvisualizer.dll
       UseMinimatch: true
       signConfigType: inlineSignParams
@@ -395,29 +396,23 @@ jobs:
             "toolVersion": "6.2.9304.0"
           }
         ]
+
   - task: CmdLine@2
     displayName: Stage Signed Binaries
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: >-
         echo F|xcopy /S /Q /Y /F x86\cppwinrt\cppwinrt.exe $(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe
-
         echo F|xcopy /S /Q /Y /F  x86\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x86\Component\cppwinrtvisualizer.dll
-
         echo F|xcopy /S /Q /Y /F  x64\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x64\Component\cppwinrtvisualizer.dll
-
         echo F|xcopy /S /Q /Y /F  arm64\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\arm64\Component\cppwinrtvisualizer.dll
-
         echo F|xcopy /S /Q /Y /F  x86\Standalone\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x86\Standalone\cppwinrtvisualizer.dll
-
         echo F|xcopy /S /Q /Y /F  x64\Standalone\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x64\Standalone\cppwinrtvisualizer.dll
-
         echo F|xcopy /S /Q /Y /F  arm64\Standalone\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\arm64\Standalone\cppwinrtvisualizer.dll
       workingDirectory: $(Build.SourcesDirectory)
       failOnStderr: true
+
   - task: CmdLine@2
     displayName: Stage cppwinrtvisualizer.vsdconfig
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: >-
         copy $(Build.SourcesDirectory)\x86\Component\cppwinrtvisualizer.vsdconfig x86\Component\cppwinrtvisualizer.vsdconfig
@@ -425,19 +420,20 @@ jobs:
         copy $(Build.SourcesDirectory)\x86\Standalone\cppwinrtvisualizer.vsdconfig x86\Standalone\cppwinrtvisualizer.vsdconfig
       workingDirectory: $(Build.ArtifactStagingDirectory)
       failOnStderr: true
+      
   - task: NuGetCommand@2
     displayName: Build NuGet
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       command: pack
       searchPatternPack: nuget/Microsoft.Windows.CppWinRT.nuspec
       versioningScheme: byBuildNumber
       buildProperties: 'cppwinrt_exe=$(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=$(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib '
+
   - task: ComponentGovernanceComponentDetection@0
     displayName: Component Detection
+
   - task: EsrpCodeSigning@1
     displayName: ESRP CodeSigning Nuget Package
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
       FolderPath: $(Build.ArtifactStagingDirectory)
@@ -461,31 +457,31 @@ jobs:
               "ToolVersion" : "1.0"
           }
         ]
+
   - task: PkgESNuGetPublisher@0
     displayName: Publish NuGet Package
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       searchPattern: $(System.ArtifactsDirectory)\Microsoft.Windows.CppWinRT.$(Build.BuildNumber).nupkg
       nuGetFeedType: internal
       feedName: https://microsoft.pkgs.visualstudio.com/_packaging/CppWinRT/nuget/v3/index.json
+
   - task: VSBuild@1
     displayName: Build Component VSIXes
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       solution: vsix/vsix.sln
       msbuildArgs: /p:Deployment=Component,CppWinRTVersion=$(Build.BuildNumber),NatvisDirx86=$(Build.ArtifactStagingDirectory)\x86\Component\,NatvisDirx64=$(Build.ArtifactStagingDirectory)\x64\Component\,NatvisDirarm64=$(Build.ArtifactStagingDirectory)\arm64\Component\,NupkgDir=$(Build.ArtifactStagingDirectory) /restore
       platform: Any CPU
       configuration: Release
+
   - task: ExtractFiles@1
     displayName: Extract Component VSIX files for signing
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       archiveFilePatterns: $(Build.SourcesDirectory)\vsix\Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
       destinationFolder: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
       overwriteExistingFiles: true
+
   - task: EsrpCodeSigning@1
     displayName: ESRP CodeSign VSIX contents
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
       FolderPath: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
@@ -525,32 +521,28 @@ jobs:
         ]
   - task: ArchiveFiles@2
     displayName: Repack signed VSIX contents
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       rootFolderOrFile: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
       includeRootFolder: false
       archiveFile: $(Build.SourcesDirectory)\vsix\Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
+
   - task: VSBuild@1
     displayName: Build Standalone VSIXes
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       solution: vsix/vsix.sln
       msbuildArgs: /p:Deployment=Standalone,CppWinRTVersion=$(Build.BuildNumber),NatvisDirx86=$(Build.ArtifactStagingDirectory)\x86\Standalone\,NatvisDirx64=$(Build.ArtifactStagingDirectory)\x64\Standalone\,NatvisDirarm64=$(Build.ArtifactStagingDirectory)\arm64\Standalone\,NupkgDir=$(Build.ArtifactStagingDirectory) /restore
       platform: x86
       configuration: Release
+
   - task: EsrpCodeSigning@1
     displayName: ESRP CodeSigning VSIX
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
       FolderPath: $(Build.SourcesDirectory)\vsix\
       Pattern: >-
         Dev16\bin\Release\Component\Microsoft.Windows.CppWinRT.vsix
-
         Dev16\bin\Release\Standalone\Microsoft.Windows.CppWinRT.vsix
-
         Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
-
         Dev17\bin\Release\Standalone\Microsoft.Windows.CppWinRT.Dev17.vsix
       UseMinimatch: true
       signConfigType: inlineSignParams
@@ -573,89 +565,84 @@ jobs:
                     "ToolVersion" : "1.0"
                 }
         ]
+
   - task: CmdLine@2
     displayName: Stage Component VSIX (Dev17)
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: >-
         echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.vsix $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.vsix
-
         echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.json $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.json
-
         echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.pdb $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.pdb
       workingDirectory: $(Build.SourcesDirectory)\vsix\Dev17\bin\Release\Component
       failOnStderr: true
+
   - task: CopyFiles@2
     displayName: Stage Component VSIX Manifest (Dev17)
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\vsix
       Contents: >-
         extension.manifest.json
-
         overview.md
       TargetFolder: $(Build.ArtifactStagingDirectory)\Component\Dev17
       OverWrite: true
+
   - task: CmdLine@2
     displayName: Stage Standalone VSIX (Dev16)
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.vsix $(Build.ArtifactStagingDirectory)\Standalone\Dev16\Microsoft.Windows.CppWinRT.vsix
       workingDirectory: $(Build.SourcesDirectory)\vsix\Dev16\bin\$(BuildConfiguration)\Standalone
       failOnStderr: true
+
   - task: CopyFiles@2
     displayName: Stage Standalone VSIX Manifest (Dev16)
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\vsix
       Contents: >-
         extension.manifest.json
-
         overview.md
       TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone\Dev16
       OverWrite: true
+
   - task: CmdLine@2
     displayName: Stage Standalone VSIX (Dev17)
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       script: echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.vsix $(Build.ArtifactStagingDirectory)\Standalone\Dev17\Microsoft.Windows.CppWinRT.Dev17.vsix
       workingDirectory: $(Build.SourcesDirectory)\vsix\Dev17\bin\$(BuildConfiguration)\Standalone
       failOnStderr: true
+
   - task: CopyFiles@2
     displayName: Stage Standalone VSIX Manifest (Dev17)
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\vsix
       Contents: >-
         extension.manifest.json
-
         overview.md
       TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone\Dev17
       OverWrite: true
+
   - task: ManifestGeneratorTask@0
     displayName: SBOM for Dev16
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)\Standalone\Dev16
+
   - task: ManifestGeneratorTask@0
     displayName: SBOM for Dev17 Standalone
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)\Standalone\Dev17
+
   - task: ManifestGeneratorTask@0
     displayName: SBOM for Dev17 Component
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)\Component\Dev17
+
   - task: PublishPipelineArtifact@0
     displayName: Publish VSIX
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       artifactName: Publish
       targetPath: $(Build.ArtifactStagingDirectory)
+
   - task: PublishSymbols@2
     displayName: Publish Component VSIX symbols
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SymbolsFolder: $(Build.ArtifactStagingDirectory)
       SearchPattern: '**/Microsoft.Windows.CppWinRT.Dev17.pdb'

From c668da8ca6402ab3ffbc2b7d6693613e397f4bc8 Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Mon, 30 Jan 2023 18:04:03 -0800
Subject: [PATCH 3/9] yml typo

---
 .pipelines/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index e5cf5a3e0..116a0eb1b 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -132,7 +132,7 @@ jobs:
 - job: BuildInternal
   displayName: Build Internal Packages (VPacks)
   dependsOn: BuildBinaries
-  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual')))
+  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
   pool:
     name: Azure Pipelines
     vmImage: 'windows-2022'

From f70db81044f54c13a1ade09e1338711069cfac5f Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Mon, 30 Jan 2023 18:06:06 -0800
Subject: [PATCH 4/9] Update build.yml for Azure Pipelines

---
 .pipelines/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index 116a0eb1b..91529a15e 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -308,7 +308,7 @@ jobs:
   displayName: Build External Packages (NuGet, VSIX)
   cancelTimeoutInMinutes: 1
   dependsOn: BuildBinaries
-  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual')))
+  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
   pool:
     name: Azure Pipelines
     vmImage: 'windows-2022'

From f9812ed956fc360cc581cbf3e7d323c831c55a7c Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Mon, 30 Jan 2023 20:03:55 -0800
Subject: [PATCH 5/9] Fix some conversion weirdness in multiline inputs

---
 .pipelines/build.yml | 49 ++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index 116a0eb1b..c9a239d3f 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -48,7 +48,7 @@ jobs:
   - task: CmdLine@2
     displayName: Build Tools
     inputs:
-      script: >-
+      script: |
         if "%VSCMD_VER%"=="" (
             pushd c:
             call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" >nul 2>&1
@@ -71,7 +71,7 @@ jobs:
     condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
-      Contents: >-
+      Contents: |
         cppwinrt.exe
         cppwinrt.pdb
       TargetFolder: $(Build.ArtifactStagingDirectory)\cppwinrt
@@ -81,7 +81,7 @@ jobs:
     condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: '$(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Component '
-      Contents: >
+      Contents: |
         cppwinrtvisualizer.dll
         cppwinrtvisualizer.pdb
         cppwinrtvisualizer.vsdconfig
@@ -92,7 +92,7 @@ jobs:
     condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Standalone
-      Contents: >
+      Contents: |
         cppwinrtvisualizer.dll
         cppwinrtvisualizer.pdb
         cppwinrtvisualizer.vsdconfig
@@ -139,7 +139,6 @@ jobs:
   steps:
   - checkout: self
     clean: true
-    fetchTags: false
     persistCredentials: True
 
   - task: PkgESSetupBuild@12
@@ -183,18 +182,14 @@ jobs:
   - task: CmdLine@2
     displayName: Copy compiler contents for internal signing
     inputs:
-      script: >
+      script: |
         md $(Build.SourcesDirectory)\x86\tempsign
-
         echo Build Sources Directory:
         dir $(Build.SourcesDirectory)
-
         echo x86
         dir $(Build.SourcesDirectory)\x86
-
         echo cppwinrt
         dir $(Build.SourcesDirectory)\x86\cppwinrt
-
         xcopy $(Build.SourcesDirectory)\x86\cppwinrt\*.* $(Build.SourcesDirectory)\x86\tempsign /icefzy
 
   - task: EsrpCodeSigning@1
@@ -203,7 +198,7 @@ jobs:
       ConnectedServiceName: bf601a97-455d-4977-b248-07b90c96eed9
       FolderPath: $(Build.SourcesDirectory)\x86\tempsign
       signConfigType: inlineSignParams
-      inlineOperation: >-
+      inlineOperation: |
         [
             {
                 "KeyCode" : "CP-458204",
@@ -246,7 +241,7 @@ jobs:
   - task: CmdLine@2
     displayName: Delete internal compiler copy
     inputs:
-      script: >+
+      script: |
         rd $(Build.SourcesDirectory)\x86\tempsign /q /s
 
   - task: CopyFiles@2
@@ -289,11 +284,9 @@ jobs:
     displayName: Stage OSBuildTools.Manifest Update
     enabled: False
     inputs:
-      script: >-
+      script: |
         copy $(Build.SourcesDirectory)\src\package\cppwinrt\vpack\GitCheckin.json
-
         copy $(Build.SourcesDirectory)\vpack\*.man OSBuildTools.Manifest.Update
-
         type OSBuildTools.Manifest.Update
       workingDirectory: $(Build.ArtifactStagingDirectory)
       failOnStderr: true
@@ -315,7 +308,6 @@ jobs:
   steps:
   - checkout: self
     clean: true
-    fetchTags: false
     persistCredentials: True
 
   - task: NuGetToolInstaller@1
@@ -356,7 +348,7 @@ jobs:
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
       FolderPath: $(Build.SourcesDirectory)
-      Pattern: >-
+      Pattern: |
         x86\cppwinrt\cppwinrt.exe
         x86\Component\cppwinrtvisualizer.dll
         x64\Component\cppwinrtvisualizer.dll
@@ -365,7 +357,7 @@ jobs:
         x64\Standalone\cppwinrtvisualizer.dll
       UseMinimatch: true
       signConfigType: inlineSignParams
-      inlineOperation: >-
+      inlineOperation: |
         [
           {
             "keyCode": "CP-230012",
@@ -400,7 +392,7 @@ jobs:
   - task: CmdLine@2
     displayName: Stage Signed Binaries
     inputs:
-      script: >-
+      script: |
         echo F|xcopy /S /Q /Y /F x86\cppwinrt\cppwinrt.exe $(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe
         echo F|xcopy /S /Q /Y /F  x86\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x86\Component\cppwinrtvisualizer.dll
         echo F|xcopy /S /Q /Y /F  x64\Component\cppwinrtvisualizer.dll $(Build.ArtifactStagingDirectory)\x64\Component\cppwinrtvisualizer.dll
@@ -414,9 +406,8 @@ jobs:
   - task: CmdLine@2
     displayName: Stage cppwinrtvisualizer.vsdconfig
     inputs:
-      script: >-
+      script: |
         copy $(Build.SourcesDirectory)\x86\Component\cppwinrtvisualizer.vsdconfig x86\Component\cppwinrtvisualizer.vsdconfig
-
         copy $(Build.SourcesDirectory)\x86\Standalone\cppwinrtvisualizer.vsdconfig x86\Standalone\cppwinrtvisualizer.vsdconfig
       workingDirectory: $(Build.ArtifactStagingDirectory)
       failOnStderr: true
@@ -440,7 +431,7 @@ jobs:
       Pattern: Microsoft.Windows.CppWinRT.*.nupkg
       UseMinimatch: true
       signConfigType: inlineSignParams
-      inlineOperation: >-
+      inlineOperation: |
         [
           {
             "KeyCode" : "CP-401405",
@@ -488,7 +479,7 @@ jobs:
       Pattern: '**/Microsoft.Windows.CppWinRT.*.dll'
       UseMinimatch: true
       signConfigType: inlineSignParams
-      inlineOperation: >-
+      inlineOperation: |
         [
           {
             "keyCode": "CP-230012",
@@ -539,14 +530,14 @@ jobs:
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
       FolderPath: $(Build.SourcesDirectory)\vsix\
-      Pattern: >-
+      Pattern: |
         Dev16\bin\Release\Component\Microsoft.Windows.CppWinRT.vsix
         Dev16\bin\Release\Standalone\Microsoft.Windows.CppWinRT.vsix
         Dev17\bin\Release\Component\Microsoft.Windows.CppWinRT.Dev17.vsix
         Dev17\bin\Release\Standalone\Microsoft.Windows.CppWinRT.Dev17.vsix
       UseMinimatch: true
       signConfigType: inlineSignParams
-      inlineOperation: >
+      inlineOperation: |
         [
                 {
                     "KeyCode" : "CP-233016",
@@ -569,7 +560,7 @@ jobs:
   - task: CmdLine@2
     displayName: Stage Component VSIX (Dev17)
     inputs:
-      script: >-
+      script: |
         echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.vsix $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.vsix
         echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.json $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.json
         echo F|xcopy /S /Q /Y /F Microsoft.Windows.CppWinRT.Dev17.pdb $(Build.ArtifactStagingDirectory)\Component\Dev17\Microsoft.Windows.CppWinRT.Dev17.pdb
@@ -580,7 +571,7 @@ jobs:
     displayName: Stage Component VSIX Manifest (Dev17)
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\vsix
-      Contents: >-
+      Contents: |
         extension.manifest.json
         overview.md
       TargetFolder: $(Build.ArtifactStagingDirectory)\Component\Dev17
@@ -597,7 +588,7 @@ jobs:
     displayName: Stage Standalone VSIX Manifest (Dev16)
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\vsix
-      Contents: >-
+      Contents: |
         extension.manifest.json
         overview.md
       TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone\Dev16
@@ -614,7 +605,7 @@ jobs:
     displayName: Stage Standalone VSIX Manifest (Dev17)
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\vsix
-      Contents: >-
+      Contents: |
         extension.manifest.json
         overview.md
       TargetFolder: $(Build.ArtifactStagingDirectory)\Standalone\Dev17

From 99f1957e3f9cd15ad76fe9dc3cf3a35a0adf6f42 Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Mon, 30 Jan 2023 21:37:54 -0800
Subject: [PATCH 6/9] Add .NET Core 2.1 install for ESRP signing

---
 .pipelines/build.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index cd694fea9..5254e87ea 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -149,6 +149,11 @@ jobs:
       disableMsbuildVersion: true
       disableBuildTools: true
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core runtime 2.1.x (required for ESRP signing)'
+    inputs:
+      version: 2.1.x
+
   - task: DownloadPipelineArtifact@1
     displayName: Download x86 Artifacts
     inputs:
@@ -310,6 +315,11 @@ jobs:
     clean: true
     persistCredentials: True
 
+  - task: UseDotNet@2
+    displayName: 'Use .NET Core runtime 2.1.x (required for ESRP signing)'
+    inputs:
+      version: 2.1.x
+      
   - task: NuGetToolInstaller@1
     displayName: Use NuGet 6.0.2
     continueOnError: True

From e88c8ccbf4f579c3ed93499a25d551293ce49b7a Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Tue, 31 Jan 2023 10:29:15 -0800
Subject: [PATCH 7/9] Address PR feedback

---
 .pipelines/build.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index 5254e87ea..7530437b1 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -31,6 +31,10 @@ jobs:
         buildPlatform: 'arm'
       arm64:
         buildPlatform: 'arm64'
+
+  variables:
+    stageVisualizer: $[and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))]
+
   steps:
   - checkout: self
     clean: true
@@ -41,8 +45,8 @@ jobs:
     continueOnError: True
     inputs:
       versionSpec: 6.0.2
-  - task: NuGetCommand@2
 
+  - task: NuGetCommand@2
     displayName: NuGet restore
 
   - task: CmdLine@2
@@ -78,9 +82,9 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage Component cppwinrtvisualizer.*
-    condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: eq(variables.stageVisualizer, 'true')
     inputs:
-      SourceFolder: '$(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Component '
+      SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Component
       Contents: |
         cppwinrtvisualizer.dll
         cppwinrtvisualizer.pdb
@@ -89,7 +93,7 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage Standalone cppwinrtvisualizer.*
-    condition: and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: eq(variables.stageVisualizer, 'true')
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Standalone
       Contents: |

From 96cf707c74b1c2243685ced8e2794c7dce78bb1c Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Tue, 31 Jan 2023 10:35:12 -0800
Subject: [PATCH 8/9] Index sources and move to ESRP signing 2.* to try and
 resolve .NET version problems

---
 .pipelines/build.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index 7530437b1..9f2e2c0c0 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -129,7 +129,6 @@ jobs:
     inputs:
       SymbolsFolder: $(Build.ArtifactStagingDirectory)
       SearchPattern: '**/*.pdb'
-      IndexSources: false
       SymbolServerType: TeamServices
       SymbolsProduct: CppWinRT
 
@@ -153,11 +152,6 @@ jobs:
       disableMsbuildVersion: true
       disableBuildTools: true
 
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core runtime 2.1.x (required for ESRP signing)'
-    inputs:
-      version: 2.1.x
-
   - task: DownloadPipelineArtifact@1
     displayName: Download x86 Artifacts
     inputs:
@@ -201,7 +195,7 @@ jobs:
         dir $(Build.SourcesDirectory)\x86\cppwinrt
         xcopy $(Build.SourcesDirectory)\x86\cppwinrt\*.* $(Build.SourcesDirectory)\x86\tempsign /icefzy
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@2
     displayName: Sign Compiler vPack for internal use
     inputs:
       ConnectedServiceName: bf601a97-455d-4977-b248-07b90c96eed9
@@ -319,11 +313,6 @@ jobs:
     clean: true
     persistCredentials: True
 
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core runtime 2.1.x (required for ESRP signing)'
-    inputs:
-      version: 2.1.x
-      
   - task: NuGetToolInstaller@1
     displayName: Use NuGet 6.0.2
     continueOnError: True
@@ -357,7 +346,7 @@ jobs:
       artifactName: $(BuildConfiguration)_arm64
       downloadPath: $(Build.SourcesDirectory)\arm64
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@2
     displayName: ESRP CodeSigning NatVis
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -437,7 +426,7 @@ jobs:
   - task: ComponentGovernanceComponentDetection@0
     displayName: Component Detection
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@2
     displayName: ESRP CodeSigning Nuget Package
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -485,7 +474,7 @@ jobs:
       destinationFolder: $(Agent.TempDirectory)\Microsoft.Windows.CppWinRT.Dev17.vsix
       overwriteExistingFiles: true
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@2
     displayName: ESRP CodeSign VSIX contents
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -539,7 +528,7 @@ jobs:
       platform: x86
       configuration: Release
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@2
     displayName: ESRP CodeSigning VSIX
     inputs:
       ConnectedServiceName: 81cc6790-027c-4ef3-928d-65e8b96a691a
@@ -651,7 +640,6 @@ jobs:
     inputs:
       SymbolsFolder: $(Build.ArtifactStagingDirectory)
       SearchPattern: '**/Microsoft.Windows.CppWinRT.Dev17.pdb'
-      IndexSources: false
       SymbolServerType: TeamServices
       SymbolsProduct: CppWinRT
 ...

From 5c59269adb227854de14e9a48df08b9197d5258d Mon Sep 17 00:00:00 2001
From: Ryan Shepherd <ryansh@microsoft.com>
Date: Tue, 31 Jan 2023 15:44:48 -0800
Subject: [PATCH 9/9] Refactor 'Manual' && 'Release' into variable

---
 .pipelines/build.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.pipelines/build.yml b/.pipelines/build.yml
index 9f2e2c0c0..8cc369d6d 100644
--- a/.pipelines/build.yml
+++ b/.pipelines/build.yml
@@ -14,6 +14,10 @@ schedules:
     include:
     - refs/heads/master
 name: $(MajorVersion).$(MinorVersion).$(date:yyMMdd)$(rev:.r)
+
+variables:
+  manualRelease: $[and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))]
+
 jobs:
 - job: BuildBinaries
   pool:
@@ -32,9 +36,6 @@ jobs:
       arm64:
         buildPlatform: 'arm64'
 
-  variables:
-    stageVisualizer: $[and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))]
-
   steps:
   - checkout: self
     clean: true
@@ -72,7 +73,7 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage cppwinrt.*
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables.manualRelease, 'true'))
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
       Contents: |
@@ -82,7 +83,7 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage Component cppwinrtvisualizer.*
-    condition: eq(variables.stageVisualizer, 'true')
+    condition: $[and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables.manualRelease, 'true'))]
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Component
       Contents: |
@@ -93,7 +94,7 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage Standalone cppwinrtvisualizer.*
-    condition: eq(variables.stageVisualizer, 'true')
+    condition: $[and(or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables.manualRelease, 'true'))]
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\natvis\$(BuildPlatform)\$(BuildConfiguration)\Standalone
       Contents: |
@@ -104,7 +105,7 @@ jobs:
 
   - task: CopyFiles@2
     displayName: Stage cppwinrt_fast_forwarder.lib
-    condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: eq(variables.manualRelease, 'true')
     inputs:
       SourceFolder: $(Build.SourcesDirectory)\_build\$(BuildPlatform)\$(BuildConfiguration)
       Contents: cppwinrt_fast_forwarder.lib
@@ -112,20 +113,20 @@ jobs:
 
   - task: ManifestGeneratorTask@0
     displayName: 'Manifest Generator '
-    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: and(eq(variables['BuildPlatform'], 'x86'), eq(variables.manualRelease, 'true'))
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)\cppwinrt
 
   - task: PublishPipelineArtifact@0
     displayName: Publish Artifacts
-    condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: eq(variables.manualRelease, 'true')
     inputs:
       artifactName: $(BuildConfiguration)_$(BuildPlatform)
       targetPath: $(Build.ArtifactStagingDirectory)
 
   - task: PublishSymbols@2
     displayName: Publish symbols
-    condition: and(eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+    condition: eq(variables.manualRelease, 'true')
     inputs:
       SymbolsFolder: $(Build.ArtifactStagingDirectory)
       SearchPattern: '**/*.pdb'
@@ -135,7 +136,7 @@ jobs:
 - job: BuildInternal
   displayName: Build Internal Packages (VPacks)
   dependsOn: BuildBinaries
-  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+  condition: and(succeeded(), ne(variables['SkipInternalPackages'], 'true'), eq(variables.manualRelease, 'true'))
   pool:
     name: Azure Pipelines
     vmImage: 'windows-2022'
@@ -304,7 +305,7 @@ jobs:
   displayName: Build External Packages (NuGet, VSIX)
   cancelTimeoutInMinutes: 1
   dependsOn: BuildBinaries
-  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'release'), in(variables['Build.Reason'], 'Manual'))
+  condition: and(succeeded(), eq(variables.manualRelease, 'true'))
   pool:
     name: Azure Pipelines
     vmImage: 'windows-2022'