@@ -19,19 +19,6 @@ steps:
1919 set -x
2020 df -h
2121
22- # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo.
23- internalRestoreArgs=
24- if ! git diff --quiet; then
25- internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true'
26- # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo.
27- # This only works if there is a username/email configured, which won't be the case in most CI runs.
28- git config --get user.email
29- if [ $? -ne 0 ]; then
30- git config user.email [email protected] 31- git config user.name dn-bot
32- fi
33- fi
34-
3522 # If building on the internal project, the internal storage variable may be available (usually only if needed)
3623 # In that case, add variables to allow the download of internal runtimes if the specified versions are not found
3724 # in the default public locations.
@@ -46,11 +33,6 @@ steps:
4633 buildConfig='$(_BuildConfig)'
4734 fi
4835
49- officialBuildArgs=
50- if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then
51- officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
52- fi
53-
5436 targetRidArgs=
5537 if [ '${{ parameters.platform.targetRID }}' != '' ]; then
5638 targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -66,57 +48,30 @@ steps:
6648 baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
6749 fi
6850
69- publishArgs=
70- if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
71- publishArgs='--publish'
72- fi
73-
74- assetManifestFileName=SourceBuild_RidSpecific.xml
75- if [ '${{ parameters.platform.name }}' != '' ]; then
76- assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
77- fi
78-
7951 portableBuildArgs=
8052 if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
8153 portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8254 fi
8355
8456 ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8557 --configuration $buildConfig \
86- --restore --build --pack $publishArgs -bl \
58+ --restore --build --pack -bl \
8759 ${{ parameters.platform.buildArguments }} \
88- $officialBuildArgs \
8960 $internalRuntimeDownloadArgs \
90- $internalRestoreArgs \
9161 $targetRidArgs \
9262 $runtimeOsArgs \
9363 $baseOsArgs \
9464 $portableBuildArgs \
9565 /p:DotNetBuildSourceOnly=true \
9666 /p:DotNetBuildRepo=true \
97- /p:AssetManifestFileName=$assetManifestFileName
9867 displayName : Build
9968
100- # Upload build logs for diagnosis.
101- - task : CopyFiles@2
102- displayName : Prepare BuildLogs staging directory
103- inputs :
104- SourceFolder : ' $(Build.SourcesDirectory)'
105- Contents : |
106- **/*.log
107- **/*.binlog
108- artifacts/sb/prebuilt-report/**
109- TargetFolder : ' $(Build.StagingDirectory)/BuildLogs'
110- CleanTargetFolder : true
111- continueOnError : true
112- condition : succeededOrFailed()
113-
11469- template : /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
11570 parameters :
11671 is1ESPipeline : ${{ parameters.is1ESPipeline }}
11772 args :
11873 displayName : Publish BuildLogs
119- targetPath : ' $(Build.StagingDirectory)/BuildLogs '
74+ targetPath : artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }}
12075 artifactName : BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
12176 continueOnError : true
12277 condition : succeededOrFailed()
0 commit comments