diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 428b78034..8d6abab4d 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -28,6 +28,8 @@ jobs: timeoutInMinutes: 180 variables: _TarballDir: $(Build.StagingDirectory)/tarball + _BuildConfig: Release + _BuildArch: x64 workspace: clean: all @@ -74,21 +76,10 @@ jobs: docker run --rm -v $(_TarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh ${customBuildArgs} -- /p:CleanWhileBuilding=true displayName: Build Tarball - - task: CopyFiles@2 - displayName: Gather Source Build Artifacts - inputs: - SourceFolder: $(_TarballDir) - Contents: | - artifacts/**/Private.SourceBuilt.Artifacts*.tar.gz - artifacts/prebuilt-report/Private.SourceBuilt.Prebuilts.*.tar.gz - TargetFolder: '$(Build.StagingDirectory)/artifacts' - CleanTargetFolder: true - - - task: PublishPipelineArtifact@1 - displayName: Publish Source Build Artifacts - inputs: - targetPath: '$(Build.StagingDirectory)/artifacts' - artifactName: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - publish: '$(_TarballDir)/artifacts/$(_BuildArch)/$(_BuildConfig)/' + artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt) + displayName: Publish Source Build Artifacts - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml parameters: diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index efb4d10fc..40d416adc 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -138,14 +138,12 @@ Overwrite="true" /> - + AfterTargets="Build"> $(PrivateSourceBuiltPrebuiltsPackageVersionPrefix)$([MSBuild]::Add($(PrivateSourceBuiltPrebuiltsPackageVersionSuffix), 1)) - $(PackageReportDir)$(SourceBuiltPrebuiltsTarballName).$(TarballFileVersion).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(TarballFileVersion).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index 7aa73cd8e..a3a2f394c 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -97,15 +97,19 @@ AfterTargets="ExtractIntermediatePackages" Inputs="$(MSBuildProjectFullPath)" Outputs="$(RepoCompletedSemaphorePath)CopyTarBall.complete"> + + + $(SourceBuiltAssetsDir)dotnet-sdk-*$(TarBallExtension) + + - + - + - +