Skip to content

Commit cebe945

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 53621: merge from public 8
2 parents 96f3e0a + ee843b6 commit cebe945

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+754
-424
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.25270.1",
18+
"version": "8.0.0-prerelease.25427.2",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 76 additions & 76 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25310.3</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25310.3</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25310.3</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25310.3</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25310.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25310.3</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25310.3</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25310.3</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25461.1</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25461.1</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25461.1</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25461.1</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25461.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25461.1</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25461.1</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25461.1</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -153,20 +153,20 @@
153153
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
154154
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
155155
<!-- Runtime-Assets dependencies -->
156-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25311.1</SystemRuntimeNumericsTestDataVersion>
157-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25311.1</SystemComponentModelTypeConverterTestDataVersion>
158-
<SystemDataCommonTestDataVersion>8.0.0-beta.25311.1</SystemDataCommonTestDataVersion>
159-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25311.1</SystemDrawingCommonTestDataVersion>
160-
<SystemFormatsTarTestDataVersion>8.0.0-beta.25311.1</SystemFormatsTarTestDataVersion>
161-
<SystemIOCompressionTestDataVersion>8.0.0-beta.25311.1</SystemIOCompressionTestDataVersion>
162-
<SystemIOPackagingTestDataVersion>8.0.0-beta.25311.1</SystemIOPackagingTestDataVersion>
163-
<SystemNetTestDataVersion>8.0.0-beta.25311.1</SystemNetTestDataVersion>
164-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25311.1</SystemPrivateRuntimeUnicodeDataVersion>
165-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25311.1</SystemRuntimeTimeZoneDataVersion>
166-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25311.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
167-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25311.1</SystemTextRegularExpressionsTestDataVersion>
168-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25311.1</SystemWindowsExtensionsTestDataVersion>
169-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25311.1</MicrosoftDotNetCilStripSourcesVersion>
156+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25467.2</SystemRuntimeNumericsTestDataVersion>
157+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25467.2</SystemComponentModelTypeConverterTestDataVersion>
158+
<SystemDataCommonTestDataVersion>8.0.0-beta.25467.2</SystemDataCommonTestDataVersion>
159+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25467.2</SystemDrawingCommonTestDataVersion>
160+
<SystemFormatsTarTestDataVersion>8.0.0-beta.25467.2</SystemFormatsTarTestDataVersion>
161+
<SystemIOCompressionTestDataVersion>8.0.0-beta.25467.2</SystemIOCompressionTestDataVersion>
162+
<SystemIOPackagingTestDataVersion>8.0.0-beta.25467.2</SystemIOPackagingTestDataVersion>
163+
<SystemNetTestDataVersion>8.0.0-beta.25467.2</SystemNetTestDataVersion>
164+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25467.2</SystemPrivateRuntimeUnicodeDataVersion>
165+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25467.2</SystemRuntimeTimeZoneDataVersion>
166+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25467.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
167+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25467.2</SystemTextRegularExpressionsTestDataVersion>
168+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25467.2</SystemWindowsExtensionsTestDataVersion>
169+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25467.2</MicrosoftDotNetCilStripSourcesVersion>
170170
<!-- dotnet-optimization dependencies -->
171171
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
172172
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -195,10 +195,10 @@
195195
<!-- Testing -->
196196
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
197197
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
198-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25270.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
199-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25270.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
200-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25270.1</MicrosoftDotNetXHarnessCLIVersion>
201-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25378.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
198+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25427.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
199+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25427.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
200+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25427.2</MicrosoftDotNetXHarnessCLIVersion>
201+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25411.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
202202
<XUnitVersion>2.4.2</XUnitVersion>
203203
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
204204
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
@@ -229,7 +229,7 @@
229229
<!-- ILCompiler -->
230230
<MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23406.6</MicrosoftDotNetILCompilerVersion>
231231
<!-- ICU -->
232-
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.23523.2</MicrosoftNETCoreRuntimeICUTransportVersion>
232+
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rtm.25466.3</MicrosoftNETCoreRuntimeICUTransportVersion>
233233
<!-- MsQuic -->
234234
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
235235
<SystemNetMsQuicTransportVersion>8.0.0-alpha.1.23527.1</SystemNetMsQuicTransportVersion>
@@ -269,7 +269,7 @@
269269
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
270270
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
271271
<!-- installer version, for testing workloads must be greater than or equal to global.json sdk version -->
272-
<MicrosoftDotnetSdkInternalVersion>8.0.117</MicrosoftDotnetSdkInternalVersion>
272+
<MicrosoftDotnetSdkInternalVersion>8.0.120</MicrosoftDotnetSdkInternalVersion>
273273
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
274274
</PropertyGroup>
275275
<PropertyGroup>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# displayName: Setup Private Feeds Credentials
1818
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1919
# inputs:
20-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
21-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
20+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
21+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
2222
# env:
2323
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
2424

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# - task: Bash@3
1919
# displayName: Setup Private Feeds Credentials
2020
# inputs:
21-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
22-
# arguments: $(Build.SourcesDirectory)/NuGet.config $Token
21+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
22+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token
2323
# condition: ne(variables['Agent.OS'], 'Windows_NT')
2424
# env:
2525
# Token: $(dn-bot-dnceng-artifact-feeds-rw)

‎eng/common/templates-official/job/job.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ parameters:
2121
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
2222
artifacts: ''
2323
enableMicrobuild: false
24+
microbuildUseESRP: true
2425
enablePublishBuildArtifacts: false
2526
enablePublishBuildAssets: false
2627
enablePublishTestResults: false
@@ -37,7 +38,7 @@ parameters:
3738
# Sbom related params
3839
enableSbom: true
3940
PackageVersion: 7.0.0
40-
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
41+
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
4142
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
4243

4344
jobs:
@@ -135,6 +136,11 @@ jobs:
135136
signType: $(_SignType)
136137
zipSources: false
137138
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
139+
${{ if eq(parameters.microbuildUseESRP, true) }}:
140+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
141+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
142+
${{ else }}:
143+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138144
env:
139145
TeamName: $(_TeamName)
140146
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
@@ -161,7 +167,7 @@ jobs:
161167
inputs:
162168
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
163169
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
164-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
170+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
165171
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
166172
continueOnError: true
167173

@@ -220,7 +226,7 @@ jobs:
220226
- task: 1ES.PublishBuildArtifacts@1
221227
displayName: Publish Logs
222228
inputs:
223-
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
229+
PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)'
224230
PublishLocation: Container
225231
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
226232
continueOnError: true
@@ -232,7 +238,7 @@ jobs:
232238
inputs:
233239
testResultsFormat: 'xUnit'
234240
testResultsFiles: '*.xml'
235-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
241+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
236242
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
237243
mergeTestResults: ${{ parameters.mergeTestResults }}
238244
continueOnError: true
@@ -243,7 +249,7 @@ jobs:
243249
inputs:
244250
testResultsFormat: 'VSTest'
245251
testResultsFiles: '*.trx'
246-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
252+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
247253
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
248254
mergeTestResults: ${{ parameters.mergeTestResults }}
249255
continueOnError: true
@@ -259,7 +265,7 @@ jobs:
259265
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
260266
- task: 1ES.PublishPipelineArtifact@1
261267
inputs:
262-
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
268+
targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration'
263269
artifactName: 'BuildConfiguration'
264270
displayName: 'Publish build retry configuration'
265271
continueOnError: true

‎eng/common/templates-official/job/onelocbuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11-
SourcesDirectory: $(Build.SourcesDirectory)
11+
SourcesDirectory: $(System.DefaultWorkingDirectory)
1212
CreatePr: true
1313
AutoCompletePr: false
1414
ReusePr: true
@@ -63,7 +63,7 @@ jobs:
6363
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6464
- task: Powershell@2
6565
inputs:
66-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
66+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
6767
arguments: $(_GenerateLocProjectArguments)
6868
displayName: Generate LocProject.json
6969
condition: ${{ parameters.condition }}
@@ -106,7 +106,7 @@ jobs:
106106
- task: 1ES.PublishBuildArtifacts@1
107107
displayName: Publish LocProject.json
108108
inputs:
109-
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
109+
PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
110110
PublishLocation: Container
111111
ArtifactName: Loc
112112
condition: ${{ parameters.condition }}

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ parameters:
3030

3131
signingValidationAdditionalParameters: ''
3232

33+
repositoryAlias: self
34+
3335
jobs:
3436
- job: Asset_Registry_Publish
3537

@@ -65,6 +67,9 @@ jobs:
6567
os: windows
6668
steps:
6769
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
70+
- checkout: ${{ parameters.repositoryAlias }}
71+
fetchDepth: 3
72+
clean: true
6873
- task: DownloadBuildArtifacts@0
6974
displayName: Download artifact
7075
inputs:
@@ -82,7 +87,7 @@ jobs:
8287
azureSubscription: "Darc: Maestro Production"
8388
scriptType: ps
8489
scriptLocation: scriptPath
85-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
90+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
8691
arguments: >
8792
-task PublishBuildAssets -restore -msbuildEngine dotnet
8893
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
@@ -115,7 +120,7 @@ jobs:
115120
inputs:
116121
targetType: inline
117122
script: |
118-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
123+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
119124
if(Test-Path -Path $symbolExclusionfile)
120125
{
121126
Write-Host "SymbolExclusionFile exists"
@@ -130,7 +135,7 @@ jobs:
130135
displayName: Publish SymbolPublishingExclusionsFile Artifact
131136
condition: eq(variables['SymbolExclusionFile'], 'true')
132137
inputs:
133-
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
138+
PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt'
134139
PublishLocation: Container
135140
ArtifactName: ReleaseConfigs
136141

@@ -146,7 +151,7 @@ jobs:
146151
azureSubscription: "Darc: Maestro Production"
147152
scriptType: ps
148153
scriptLocation: scriptPath
149-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
154+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
150155
arguments: -BuildId $(BARBuildId)
151156
-PublishingInfraVersion 3
152157
-AzdoToken '$(System.AccessToken)'

‎eng/common/templates-official/job/source-build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34+
# Optional list of directories to ignore for component governance scans.
35+
cgIgnoreDirectories: []
36+
3437
# If set to true and running on a non-public project,
3538
# Internal blob storage locations will be enabled.
3639
# This is not enabled by default because many repositories do not need internal sources
@@ -73,3 +76,4 @@ jobs:
7376
- template: /eng/common/templates-official/steps/source-build.yml
7477
parameters:
7578
platform: ${{ parameters.platform }}
79+
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}

‎eng/common/templates-official/job/source-index-stage1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- script: ${{ parameters.sourceIndexBuildCommand }}
6060
displayName: Build Repository
6161

62-
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
62+
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
6363
displayName: Process Binlog into indexable sln
6464

6565
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

0 commit comments

Comments
 (0)