From 1b415a74e74d68bf70273eae3d3b9240d61e54bb Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 1 Apr 2025 16:40:35 -0700
Subject: [PATCH 1/3] Update Common.props

---
 eng/Common.props | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eng/Common.props b/eng/Common.props
index 986f0273079d..f5432db50b53 100644
--- a/eng/Common.props
+++ b/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>

From a858fafce3f85591087e2d41a9906be1d7bf3fd4 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 1 Apr 2025 16:41:40 -0700
Subject: [PATCH 2/3] Update Publishing.props

---
 eng/Publishing.props | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 6eb6251e223c..15b32131f1d0 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="Common.props" />
 
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
@@ -14,16 +15,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. -->

From dd50c1906256b0cc79bb87671ad5490ea7622151 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 1 Apr 2025 16:56:28 -0700
Subject: [PATCH 3/3] Update Publishing.props

---
 eng/Publishing.props | 2 --
 1 file changed, 2 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 15b32131f1d0..269355095e20 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,6 +1,4 @@
 <Project>
-  <Import Project="Common.props" />
-
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>