Skip to content

Commit 5617669

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 52550: internal/release/9.0 - merge from public
2 parents df6b453 + f597b95 commit 5617669

21 files changed

+58
-54
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
170+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25407.2">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25415.3">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
174+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25407.2">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25415.3">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
178+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25407.2">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25415.3">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
186+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25407.2</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25415.3</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# displayName: Setup Private Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# - task: Bash@3
1212
# displayName: Setup Internal Feeds
1313
# inputs:
14-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(Build.SourcesDirectory)/NuGet.config
14+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
inputs:
167167
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
168168
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
169-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
169+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
170170
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
171171
continueOnError: true
172172

@@ -189,7 +189,7 @@ jobs:
189189
inputs:
190190
testResultsFormat: 'xUnit'
191191
testResultsFiles: '*.xml'
192-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
192+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
193193
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
194194
mergeTestResults: ${{ parameters.mergeTestResults }}
195195
continueOnError: true
@@ -200,7 +200,7 @@ jobs:
200200
inputs:
201201
testResultsFormat: 'VSTest'
202202
testResultsFiles: '*.trx'
203-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
203+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
204204
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
205205
mergeTestResults: ${{ parameters.mergeTestResults }}
206206
continueOnError: true
@@ -244,7 +244,7 @@ jobs:
244244
- task: CopyFiles@2
245245
displayName: Gather buildconfiguration for build retry
246246
inputs:
247-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
247+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
248248
Contents: '**'
249249
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
250250
continueOnError: true

‎eng/common/core-templates/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
@@ -68,7 +68,7 @@ jobs:
6868
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6969
- task: Powershell@2
7070
inputs:
71-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
71+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
7272
arguments: $(_GenerateLocProjectArguments)
7373
displayName: Generate LocProject.json
7474
condition: ${{ parameters.condition }}
@@ -115,7 +115,7 @@ jobs:
115115
is1ESPipeline: ${{ parameters.is1ESPipeline }}
116116
args:
117117
displayName: Publish LocProject.json
118-
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
118+
pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
119119
publishLocation: Container
120120
artifactName: Loc
121121
condition: ${{ parameters.condition }}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ parameters:
3232

3333
is1ESPipeline: ''
3434

35+
repositoryAlias: self
36+
3537
jobs:
3638
- job: Asset_Registry_Publish
3739

@@ -72,7 +74,7 @@ jobs:
7274
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7375

7476
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
75-
- checkout: self
77+
- checkout: ${{ parameters.repositoryAlias }}
7678
fetchDepth: 3
7779
clean: true
7880

@@ -93,7 +95,7 @@ jobs:
9395
azureSubscription: "Darc: Maestro Production"
9496
scriptType: ps
9597
scriptLocation: scriptPath
96-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
98+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
9799
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98100
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
99101
/p:MaestroApiEndpoint=https://maestro.dot.net
@@ -113,7 +115,7 @@ jobs:
113115
Add-Content -Path $filePath -Value "$(DefaultChannels)"
114116
Add-Content -Path $filePath -Value $(IsStableBuild)
115117
116-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
118+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
117119
if (Test-Path -Path $symbolExclusionfile)
118120
{
119121
Write-Host "SymbolExclusionFile exists"
@@ -142,7 +144,7 @@ jobs:
142144
azureSubscription: "Darc: Maestro Production"
143145
scriptType: ps
144146
scriptLocation: scriptPath
145-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
147+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
146148
arguments: >
147149
-BuildId $(BARBuildId)
148150
-PublishingInfraVersion 3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- script: ${{ parameters.sourceIndexBuildCommand }}
6767
displayName: Build Repository
6868

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

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

‎eng/common/core-templates/jobs/codeql-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: DefaultGuardianVersion
2626
value: 0.109.0
2727
- name: GuardianPackagesConfigFile
28-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
28+
value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
2929
- name: GuardianVersion
3030
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
3131

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
repositoryAlias: self
4647

4748
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4849
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -117,3 +118,4 @@ jobs:
117118
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118119
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
119120
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
121+
repositoryAlias: ${{ parameters.repositoryAlias }}

0 commit comments

Comments
 (0)