From 6a3a12fbee167b6c36056a7cd60534866026fe44 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 7 Mar 2024 21:41:56 +0000
Subject: [PATCH 1/4] Enable publishing in VMR

---
 eng/Publishing.props | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 18483e92a08..90a2b9cbf8e 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,5 +1,27 @@
 <Project>
   <PropertyGroup>
     <PublishingVersion>3</PublishingVersion>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
   </PropertyGroup>
+
+  <ItemGroup>
+    <_PackagesToPublish Remove="@(_PackagesToPublish)" />
+    <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildRepo)' == 'true'" />
+  </ItemGroup>
+
+  <Target Name="_PublishPackages">
+    <ItemGroup>
+      <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
+           Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+           the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
+           to be published. Use DotNetBuildRepo as DotNetBuildFromSource is only set in the internal source build,
+           and Build.proj is invoked from the wrapper build. -->
+      <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true' and '$(DotNetBuildRepo)' != 'true'" />
+
+      <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
+        <IsShipping>true</IsShipping>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+  </Target>
+
 </Project>

From 4ec4f61a8bb3b2641d1c7f2bf1d68ea94d14f3f0 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 11 Mar 2024 04:10:43 +0000
Subject: [PATCH 2/4] Trim publishing content to minimum required

---
 eng/Publishing.props | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 90a2b9cbf8e..8579d0e800f 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -6,18 +6,12 @@
 
   <ItemGroup>
     <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildRepo)' == 'true'" />
+    <!-- Additional packages needed to avoid prebuilts in VMR. -->
+    <_PackagesToPublish Include="$(ArtifactsPackagesDir)Dependency\**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
   <Target Name="_PublishPackages">
     <ItemGroup>
-      <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-           Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-           the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-           to be published. Use DotNetBuildRepo as DotNetBuildFromSource is only set in the internal source build,
-           and Build.proj is invoked from the wrapper build. -->
-      <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true' and '$(DotNetBuildRepo)' != 'true'" />
-
       <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
         <IsShipping>true</IsShipping>
       </ItemsToPushToBlobFeed>

From 8499550792d93e53c606096f42bdd1226c50ee5e Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 11 Mar 2024 16:40:32 +0000
Subject: [PATCH 3/4] Add reference to tracking issue

---
 eng/Publishing.props | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 8579d0e800f..58d2329bdc6 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -6,7 +6,9 @@
 
   <ItemGroup>
     <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <!-- Additional packages needed to avoid prebuilts in VMR. -->
+    <!--
+      Additional packages needed to avoid prebuilts in VMR - https://github.com/dotnet/source-build/issues/4203
+    -->
     <_PackagesToPublish Include="$(ArtifactsPackagesDir)Dependency\**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 

From 10c6a33f3fd759dc67f8cae13235e1c50473f404 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 13 Mar 2024 01:19:55 +0000
Subject: [PATCH 4/4] Trim publishing.props file

---
 eng/Publishing.props | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 58d2329bdc6..6a0673b5a51 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,23 +1,13 @@
 <Project>
-  <PropertyGroup>
-    <PublishingVersion>3</PublishingVersion>
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
-  </PropertyGroup>
 
   <ItemGroup>
-    <_PackagesToPublish Remove="@(_PackagesToPublish)" />
     <!--
       Additional packages needed to avoid prebuilts in VMR - https://github.com/dotnet/source-build/issues/4203
     -->
-    <_PackagesToPublish Include="$(ArtifactsPackagesDir)Dependency\**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)Dependency\**\*.nupkg"
+                           IsShipping="true"
+                           UploadPathSegment="Runtime"
+                           Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
-  <Target Name="_PublishPackages">
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
-        <IsShipping>true</IsShipping>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-  </Target>
-
 </Project>