From 1c31c67d603cfcc9ad325f273c97956b2fb6a62f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 25 Mar 2024 07:49:06 +0000
Subject: [PATCH 1/2] Put produced artifacts into shipping packages folder

---
 Directory.Build.props |  2 +-
 eng/Publishing.props  | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 eng/Publishing.props

diff --git a/Directory.Build.props b/Directory.Build.props
index 34c9d33b0d..c35fcb65ad 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -71,7 +71,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SourceBuiltPackagesPath>$(ArtifactsPackagesDir)</SourceBuiltPackagesPath>
+    <SourceBuiltPackagesPath>$(ArtifactsShippingPackagesDir)</SourceBuiltPackagesPath>
     <LoggingDir>$(BaseOutputPath)logs/</LoggingDir>
   </PropertyGroup>
 
diff --git a/eng/Publishing.props b/eng/Publishing.props
deleted file mode 100644
index 87179d30f5..0000000000
--- a/eng/Publishing.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <ItemGroup>
-    <ItemsToPushToBlobFeed Include="$(ArtifactsPackagesDir)**\*.nupkg"
-                           IsShipping="true"
-                           UploadPathSegment="Runtime"
-                           Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
-  </ItemGroup>
-
-</Project>

From 37a056e4eba767fe2e4f7d5c897afb737f16d42a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 25 Mar 2024 14:40:24 +0100
Subject: [PATCH 2/2] Update DotNetBuild.props

---
 eng/DotNetBuild.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 609b391564..529602588a 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -10,7 +10,7 @@
   <Target Name="AddSourceBuiltPackagesToSourceBuiltCache"
           BeforeTargets="WritePrebuiltUsageData">
     <ItemGroup>
-      <SourceBuiltPackageFiles Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)*.nupkg"/>
+      <SourceBuiltPackageFiles Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.nupkg"/>
     </ItemGroup>
   </Target>
 </Project>