Skip to content

Commit 3c09fbb

Browse files
Restore branch-specific files
1 parent 0740f7f commit 3c09fbb

19 files changed

+66
-111
lines changed

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: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(Build.SourcesDirectory)/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: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
14+
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(Build.SourcesDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#

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

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enableMicrobuildForMacAndLinux: false
2223
microbuildUseESRP: true
2324
enablePublishBuildArtifacts: false
2425
enablePublishBuildAssets: false
@@ -124,21 +125,11 @@ jobs:
124125
- ${{ preStep }}
125126

126127
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
127-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
128-
- task: MicroBuildSigningPlugin@4
129-
displayName: Install MicroBuild plugin
130-
inputs:
131-
signType: $(_SignType)
132-
zipSources: false
133-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
134-
${{ if eq(parameters.microbuildUseESRP, true) }}:
135-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
136-
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
137-
${{ else }}:
138-
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
139-
env:
140-
TeamName: $(_TeamName)
141-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
128+
- template: /eng/common/core-templates/steps/install-microbuild.yml
129+
parameters:
130+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
131+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132+
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
142133
continueOnError: ${{ parameters.continueOnError }}
143134

144135
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
@@ -155,16 +146,6 @@ jobs:
155146
- ${{ each step in parameters.steps }}:
156147
- ${{ step }}
157148

158-
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
159-
- task: RichCodeNavIndexer@0
160-
displayName: RichCodeNav Upload
161-
inputs:
162-
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
163-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
164-
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
165-
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
166-
continueOnError: true
167-
168149
- ${{ each step in parameters.componentGovernanceSteps }}:
169150
- ${{ step }}
170151

@@ -182,7 +163,7 @@ jobs:
182163
inputs:
183164
testResultsFormat: 'xUnit'
184165
testResultsFiles: '*.xml'
185-
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
166+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
186167
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
187168
mergeTestResults: ${{ parameters.mergeTestResults }}
188169
continueOnError: true
@@ -193,7 +174,7 @@ jobs:
193174
inputs:
194175
testResultsFormat: 'VSTest'
195176
testResultsFiles: '*.trx'
196-
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
177+
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
197178
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
198179
mergeTestResults: ${{ parameters.mergeTestResults }}
199180
continueOnError: true
@@ -237,7 +218,7 @@ jobs:
237218
- task: CopyFiles@2
238219
displayName: Gather buildconfiguration for build retry
239220
inputs:
240-
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
221+
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
241222
Contents: '**'
242223
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
243224
continueOnError: true

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

Lines changed: 6 additions & 7 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: $(System.DefaultWorkingDirectory)
11+
SourcesDirectory: $(Build.SourcesDirectory)
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: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
71+
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
7272
arguments: $(_GenerateLocProjectArguments)
7373
displayName: Generate LocProject.json
7474
condition: ${{ parameters.condition }}
@@ -112,8 +112,7 @@ jobs:
112112
parameters:
113113
is1ESPipeline: ${{ parameters.is1ESPipeline }}
114114
args:
115-
displayName: Publish LocProject.json
116-
pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
117-
publishLocation: Container
118-
artifactName: Loc
119-
condition: ${{ parameters.condition }}
115+
targetPath: '$(Build.ArtifactStagingDirectory)/loc'
116+
artifactName: 'Loc'
117+
displayName: 'Publish Localization Files'
118+
condition: ${{ parameters.condition }}

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,14 @@ parameters:
2929

3030
is1ESPipeline: ''
3131

32-
repositoryAlias: self
32+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
33+
isAssetlessBuild: false
34+
35+
# Optional, publishing version
36+
publishingVersion: 3
37+
38+
# Optional: A minimatch pattern for the asset manifests to publish to BAR
39+
assetManifestsPattern: '*/manifests/**/*.xml'
3340

3441
jobs:
3542
- job: Asset_Registry_Publish
@@ -71,7 +78,7 @@ jobs:
7178
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7279

7380
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
74-
- checkout: ${{ parameters.repositoryAlias }}
81+
- checkout: self
7582
fetchDepth: 3
7683
clean: true
7784

@@ -110,7 +117,7 @@ jobs:
110117
azureSubscription: "Darc: Maestro Production"
111118
scriptType: ps
112119
scriptLocation: scriptPath
113-
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
120+
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
114121
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
115122
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
116123
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
@@ -130,7 +137,7 @@ jobs:
130137
Add-Content -Path $filePath -Value "$(DefaultChannels)"
131138
Add-Content -Path $filePath -Value $(IsStableBuild)
132139
133-
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
140+
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
134141
if (Test-Path -Path $symbolExclusionfile)
135142
{
136143
Write-Host "SymbolExclusionFile exists"
@@ -170,7 +177,7 @@ jobs:
170177
azureSubscription: "Darc: Maestro Production"
171178
scriptType: ps
172179
scriptLocation: scriptPath
173-
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
180+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
174181
arguments: >
175182
-BuildId $(BARBuildId)
176183
-PublishingInfraVersion 3

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ jobs:
3939
- script: ${{ parameters.sourceIndexBuildCommand }}
4040
displayName: Build Repository
4141

42-
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
43-
displayName: Process Binlog into indexable sln
44-
45-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
46-
- task: AzureCLI@2
47-
displayName: Log in to Azure and upload stage1 artifacts to source index
48-
inputs:
49-
azureSubscription: 'SourceDotNet Stage1 Publish'
50-
addSpnToEnvironment: true
51-
scriptType: 'ps'
52-
scriptLocation: 'inlineScript'
53-
inlineScript: |
54-
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
42+
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
43+
parameters:
44+
binLogPath: ${{ parameters.binLogPath }}

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

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

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

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

4444
artifacts: {}
4545
is1ESPipeline: ''
46-
repositoryAlias: self
4746

4847
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4948
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -115,4 +114,3 @@ jobs:
115114
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
116115
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117116
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118-
repositoryAlias: ${{ parameters.repositoryAlias }}

eng/common/core-templates/post-build/post-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ stages:
154154
- task: PowerShell@2
155155
displayName: Validate
156156
inputs:
157-
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1
157+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
158158
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
159159

160160
- job:
@@ -208,7 +208,7 @@ stages:
208208
filePath: eng\common\sdk-task.ps1
209209
arguments: -task SigningValidation -restore -msbuildEngine vs
210210
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
211-
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
211+
/p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
212212
${{ parameters.signingValidationAdditionalParameters }}
213213

214214
- template: /eng/common/core-templates/steps/publish-logs.yml
@@ -258,7 +258,7 @@ stages:
258258
- task: PowerShell@2
259259
displayName: Validate
260260
inputs:
261-
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1
261+
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
262262
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
263263
-ExtractPath $(Agent.BuildDirectory)/Extract/
264264
-GHRepoName $(Build.Repository.Name)
@@ -313,7 +313,7 @@ stages:
313313
azureSubscription: "Darc: Maestro Production"
314314
scriptType: ps
315315
scriptLocation: scriptPath
316-
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
316+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
317317
arguments: >
318318
-BuildId $(BARBuildId)
319319
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}

eng/common/core-templates/post-build/setup-maestro-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ steps:
3636
$AzureDevOpsBuildId = $Env:Build_BuildId
3737
}
3838
else {
39-
. $(System.DefaultWorkingDirectory)\eng\common\tools.ps1
39+
. $(Build.SourcesDirectory)\eng\common\tools.ps1
4040
$darc = Get-Darc
4141
$buildInfo = & $darc get-build `
4242
--id ${{ parameters.BARBuildId }} `

0 commit comments

Comments
 (0)