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

---
 eng/Publishing.props | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 579a1360d9..c71638ecb4 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,7 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-   <PropertyGroup>
-      <PublishingVersion>3</PublishingVersion>
-      <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
-   </PropertyGroup>
-</Project>
+  <PropertyGroup>
+    <PublishingVersion>3</PublishingVersion>
+    <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_PackagesToPublish Remove="@(_PackagesToPublish)" />
+    <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Roslyn-analyzers" 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>
\ No newline at end of file

From f62d4c4f329e65cf32a353296ad827ca7ca7fc6a Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 11 Mar 2024 04:00:00 +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 c71638ecb4..6f737db685 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -8,18 +8,12 @@
 
   <ItemGroup>
     <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Roslyn-analyzers" Condition="'$(DotNetBuildRepo)' == 'true'" />
+    <!-- Additional packages needed for second-stage source-only VMR build -->
+    <_PackagesToPublish Include="$(ArtifactsPackagesDir)Release\*.nupkg" UploadPathSegment="Roslyn-analyzers" 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 109356ee5515bb8885e80d331862da10fd8943d7 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 11 Mar 2024 16:42:47 +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 6f737db685..85f06860a9 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -8,7 +8,9 @@
 
   <ItemGroup>
     <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <!-- Additional packages needed for second-stage source-only VMR build -->
+    <!--
+      Additional packages needed for second-stage source-only VMR build - https://github.com/dotnet/source-build/issues/4204
+    -->
     <_PackagesToPublish Include="$(ArtifactsPackagesDir)Release\*.nupkg" UploadPathSegment="Roslyn-analyzers" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 

From f8fa09b52637c2a770f57a06bc29c2c8ff0fe532 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 14 Mar 2024 00:29:59 +0000
Subject: [PATCH 4/4] Trim publishing.props file

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 85f06860a9..355f94a015 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,25 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <PublishingVersion>3</PublishingVersion>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
   </PropertyGroup>
 
   <ItemGroup>
-    <_PackagesToPublish Remove="@(_PackagesToPublish)" />
-    <!--
-      Additional packages needed for second-stage source-only VMR build - https://github.com/dotnet/source-build/issues/4204
-    -->
-    <_PackagesToPublish Include="$(ArtifactsPackagesDir)Release\*.nupkg" UploadPathSegment="Roslyn-analyzers" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
+    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)Release\*.nupkg"
+                           IsShipping="true"
+                           UploadPathSegment="Roslyn-analyzers"
+                           Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
   </ItemGroup>
 
-  <Target Name="_PublishPackages">
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
-        <IsShipping>true</IsShipping>
-      </ItemsToPushToBlobFeed>
-    </ItemGroup>
-  </Target>
-
 </Project>
\ No newline at end of file