Merge pull request #1537 from microsoft/main

Merge 'main' into 'release-cpptools'

Author: WardenGnaw

eng/pipelines/steps/APIScan.yml

@@ -31,11 +31,13 @@ steps:
 - task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
   displayName: 'Run APIScan'
   inputs:
+    azureSubscription: 'VSEng-APIScanSC'
     softwareFolder: '$(Pipeline.Workspace)\ApiScanFiles'
     softwareName: MIEngine
     softwareVersionNum: '$(Build.BuildNumber)'
     symbolsFolder: 'SRV*http://symweb;$(Pipeline.Workspace)\ApiScanFiles'
     isLargeApp: false
   continueOnError: true
   env:
-    AzureServicesAuthConnectionString: runAs=App;AppId=$(ApiScanClientId)
+    AzureServicesAuthConnectionString: RunAs=App;AppId=d318cba7-db4d-4fb3-99e1-01879cb74e91;TenantId=72f988bf-86f1-41af-91ab-2d7cd011db47;ServiceConnectionId=93e24264-c5e6-4681-8175-ec8a41668480;
+    SYSTEM_ACCESSTOKEN: $(System.AccessToken)

eng/pipelines/steps/CopyAndPublishSymbols.yml

@@ -14,9 +14,10 @@ steps:
     CleanTargetFolder: true
 
 
-- task: ms-vseng.MicroBuildShipTasks.0ffdda1d-8c7b-40da-b8b1-061660eaeea3.MicroBuildArchiveSymbols@5
+- task: ms-vseng.MicroBuildShipTasks.0ffdda1d-8c7b-40da-b8b1-061660eaeea3.MicroBuildArchiveSymbols@6
   displayName: 'Archive MIEngine_MDD on Symweb'
   inputs:
+    azureSubscription: 'VSEng-SymbolsUpload' 
     SymbolsFeatureName: MIEngine
     SymbolsProject: VS
     SymbolsAgentPath: '$(Build.ArtifactStagingDirectory)\Symbols\'
@@ -25,4 +26,6 @@ steps:
       ExpirationInDays: 3650 # Expire in 10 years for release builds
     ${{ else }}:
       ExpirationInDays: 1 # Expire in 1 day if used for testing
+  env:
+    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 ...