From 551dc746e034f4a4030acb751a7e369a807dd944 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 7 Mar 2024 22:15:41 +0000
Subject: [PATCH 1/5] Enable publishing in VMR

---
 eng/Publishing.props | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 eng/Publishing.props

diff --git a/eng/Publishing.props b/eng/Publishing.props
new file mode 100644
index 0000000000..3629bb8573
--- /dev/null
+++ b/eng/Publishing.props
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 cf40b32578ce6314e629c290f9298018f5e8eb28 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 11 Mar 2024 04:15:23 +0000
Subject: [PATCH 2/5] 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 3629bb8573..1e385b25ae 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -7,18 +7,12 @@
 
   <ItemGroup>
     <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildRepo)' == 'true'" />
+    <!-- Additional packages needed for source-only VMR build -->
+    <_PackagesToPublish Include="$(ArtifactsPackagesDir)Release\*.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 2fb17bdb9fdb76ccc0d5d9b874ba40341b6d45b5 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 11 Mar 2024 16:44:53 +0000
Subject: [PATCH 3/5] 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 1e385b25ae..82a95182bf 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -7,7 +7,9 @@
 
   <ItemGroup>
     <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <!-- Additional packages needed for source-only VMR build -->
+    <!--
+      Additional packages needed for source-only VMR build - https://github.com/dotnet/source-build/issues/4205
+    -->
     <_PackagesToPublish Include="$(ArtifactsPackagesDir)Release\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 

From 37ea36f12c35f127cdcad33c27e9de8d02ea02d6 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 13 Mar 2024 01:21:14 +0000
Subject: [PATCH 4/5] 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 82a95182bf..79e752c085 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <PropertyGroup>
-    <PublishingVersion>3</PublishingVersion>
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
-  </PropertyGroup>
 
   <ItemGroup>
-    <_PackagesToPublish Remove="@(_PackagesToPublish)" />
     <!--
       Additional packages needed for source-only VMR build - https://github.com/dotnet/source-build/issues/4205
     -->
-    <_PackagesToPublish Include="$(ArtifactsPackagesDir)Release\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)Release\**\*.nupkg"
+                           IsShipping="true"
+                           UploadPathSegment="Runtime"
+                           Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
-  <Target Name="_PublishPackages">
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
-        <IsShipping>true</IsShipping>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-  </Target>
-
 </Project>

From 01fb27c3ef965c464903dabeee668fe619df9e73 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 13 Mar 2024 10:54:17 +0100
Subject: [PATCH 5/5] Update eng/Publishing.props

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 79e752c085..131a4017e0 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
 
   <ItemGroup>