From 83e576f1db01431f365be371c06c79491df45c5c Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 7 Mar 2024 22:10:43 +0000
Subject: [PATCH 1/2] Enable publishing in VMR

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index d3aa836b27..3629bb8573 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,5 +2,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 aac8560f19d51247ec6ef7b7bd48008b217a092a Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 14 Mar 2024 00:28:53 +0000
Subject: [PATCH 2/2] Trim publishing.props file

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 3629bb8573..87179d30f5 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,28 +1,10 @@
-<?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'" />
+    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.nupkg"
+                           IsShipping="true"
+                           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>
-    </ItemGroup>
-  </Target>
-
 </Project>