@@ -19,6 +19,7 @@ parameters:
1919 # publishing defaults
2020 artifacts : ' '
2121 enableMicrobuild : false
22+ microbuildUseESRP : true
2223 enablePublishBuildArtifacts : false
2324 enablePublishBuildAssets : false
2425 enablePublishTestResults : false
@@ -134,6 +135,11 @@ jobs:
134135 signType : $(_SignType)
135136 zipSources : false
136137 feedSource : https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138+ ${{ if eq(parameters.microbuildUseESRP, true) }} :
139+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }} :
140+ ConnectedPMEServiceName : 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
141+ ${{ else }} :
142+ ConnectedPMEServiceName : 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137143 env :
138144 TeamName : $(_TeamName)
139145 MicroBuildOutputFolderOverride : ' $(Agent.TempDirectory)'
@@ -160,7 +166,7 @@ jobs:
160166 inputs :
161167 languages : ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
162168 environment : ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
163- richNavLogOutputDirectory : $(Build.SourcesDirectory )/artifacts/bin
169+ richNavLogOutputDirectory : $(System.DefaultWorkingDirectory )/artifacts/bin
164170 uploadRichNavArtifacts : ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
165171 continueOnError : true
166172
@@ -183,7 +189,7 @@ jobs:
183189 inputs :
184190 testResultsFormat : ' xUnit'
185191 testResultsFiles : ' *.xml'
186- searchFolder : ' $(Build.SourcesDirectory )/artifacts/TestResults/$(_BuildConfig)'
192+ searchFolder : ' $(System.DefaultWorkingDirectory )/artifacts/TestResults/$(_BuildConfig)'
187193 testRunTitle : ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
188194 mergeTestResults : ${{ parameters.mergeTestResults }}
189195 continueOnError : true
@@ -194,7 +200,7 @@ jobs:
194200 inputs :
195201 testResultsFormat : ' VSTest'
196202 testResultsFiles : ' *.trx'
197- searchFolder : ' $(Build.SourcesDirectory )/artifacts/TestResults/$(_BuildConfig)'
203+ searchFolder : ' $(System.DefaultWorkingDirectory )/artifacts/TestResults/$(_BuildConfig)'
198204 testRunTitle : ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
199205 mergeTestResults : ${{ parameters.mergeTestResults }}
200206 continueOnError : true
@@ -238,7 +244,7 @@ jobs:
238244 - task : CopyFiles@2
239245 displayName : Gather buildconfiguration for build retry
240246 inputs :
241- SourceFolder : ' $(Build.SourcesDirectory )/eng/common/BuildConfiguration'
247+ SourceFolder : ' $(System.DefaultWorkingDirectory )/eng/common/BuildConfiguration'
242248 Contents : ' **'
243249 TargetFolder : ' $(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
244250 continueOnError : true
0 commit comments