Skip to content

Commit 2c23a39

Browse files
authored
Make PublishAllBuildsAssetsInThisJob available in Signing.props (dotnet#61271)
* Update Common.props * Update Publishing.props * Update Publishing.props
1 parent 72fd6dd commit 2c23a39

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

eng/Common.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,15 @@
3737
<PropertyGroup Condition=" '$(DotNetBuildPass)' == '2' " >
3838
<RestoreUsingNuGetTargets>false</RestoreUsingNuGetTargets>
3939
</PropertyGroup>
40+
41+
<PropertyGroup>
42+
<!--
43+
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
44+
- If we're building outside of the VMR, publish these assets from the Windows job.
45+
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
46+
-->
47+
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
48+
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
49+
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
50+
</PropertyGroup>
4051
</Project>

eng/Publishing.props

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
2-
32
<PropertyGroup>
43
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
54

@@ -14,16 +13,6 @@
1413

1514
<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
1615
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
17-
18-
<!--
19-
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
20-
- If we're building outside of the VMR, publish these assets from the Windows job.
21-
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
22-
-->
23-
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
24-
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
25-
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
26-
<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
2716
</PropertyGroup>
2817

2918
<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->

0 commit comments

Comments
 (0)