Skip to content

Commit 522cf16

Browse files
authored
Produce the productVersion.txt files in runtime in the "final publish" step so we don't need to munge them through the different runtime jobs (#114706)
1 parent 0bf77b2 commit 522cf16

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

eng/Publishing.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
<ShouldGenerateProductVersionFiles Condition="'$(OutputRID)' == 'win-x64' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">true</ShouldGenerateProductVersionFiles>
8787
<ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</ShouldGenerateProductVersionFiles>
8888
</PropertyGroup>
89+
<PropertyGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
90+
<ShouldGenerateProductVersionFiles Condition="'$(DotNetFinalPublish)' == 'true'">true</ShouldGenerateProductVersionFiles>
91+
</PropertyGroup>
8992

9093
<Target Name="GenerateProductVersionFiles"
9194
DependsOnTargets="GetNonStableProductVersion"

eng/pipelines/runtime-official.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ extends:
473473
targetFolder: $(Build.SourcesDirectory)/artifacts/workloadPackages
474474
flattenFolders: true
475475

476-
buildArgs: -s mono.workloads -c $(_BuildConfig) -restore -build -publish /p:PackageSource=$(Build.SourcesDirectory)/artifacts/workloadPackages /p:WorkloadOutputPath=$(Build.SourcesDirectory)/artifacts/workloads /p:ShouldGenerateProductVersionFiles=true /p:EnableDefaultRidSpecificArtifacts=false
476+
buildArgs: -s mono.workloads -c $(_BuildConfig) -restore -build -publish /p:PackageSource=$(Build.SourcesDirectory)/artifacts/workloadPackages /p:WorkloadOutputPath=$(Build.SourcesDirectory)/artifacts/workloads /p:EnableDefaultRidSpecificArtifacts=false
477477

478478
isOfficialBuild: true
479479
timeoutInMinutes: 120

0 commit comments

Comments
 (0)