Browse Source

Make PublishAllBuildsAssetsInThisJob available in Signing.props (#61271)

* Update Common.props

* Update Publishing.props

* Update Publishing.props
William Godbe 11 months ago
parent
commit
2c23a39805
2 changed files with 11 additions and 11 deletions
  1. 11 0
      eng/Common.props
  2. 0 11
      eng/Publishing.props

+ 11 - 0
eng/Common.props

@@ -37,4 +37,15 @@
   <PropertyGroup Condition=" '$(DotNetBuildPass)' == '2' " >
     <RestoreUsingNuGetTargets>false</RestoreUsingNuGetTargets>
   </PropertyGroup>
+
+  <PropertyGroup>
+      <!--
+      Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
+      - If we're building outside of the VMR, publish these assets from the Windows job.
+      - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
+    -->
+    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
+                                                or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
+                                                    and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
+  </PropertyGroup>
 </Project>

+ 0 - 11
eng/Publishing.props

@@ -1,5 +1,4 @@
 <Project>
-
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
 
@@ -14,16 +13,6 @@
 
     <!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
     <AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
-
-    <!--
-      Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
-      - If we're building outside of the VMR, publish these assets from the Windows job.
-      - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
-    -->
-    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
-                                                or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
-                                                    and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
-    <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
   </PropertyGroup>
 
   <!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->