From 0abc035843cc0b2d64f889e5a48c15668912824b Mon Sep 17 00:00:00 2001
From: MilenaHristova <mhristova@microsoft.com>
Date: Mon, 19 Feb 2024 17:22:19 +0100
Subject: [PATCH 1/4] add property to publishing.props

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 920e79cbbd2f7c..ccb77e5cd4d5a7 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,5 +2,6 @@
   <!-- TODO: Consolidate the Publishing.props files into here. -->
   <PropertyGroup>
     <PublishingVersion>3</PublishingVersion>
+    <ProducesNetCoreAssets>true</ProducesNetCoreAssets>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 4704dc4b38db888de868aac2063d592a80ce9a8f Mon Sep 17 00:00:00 2001
From: MilenaHristova <mhristova@microsoft.com>
Date: Wed, 21 Feb 2024 10:38:18 +0100
Subject: [PATCH 2/4] rename to ProducesDotNetReleaseShippingAssets

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index ccb77e5cd4d5a7..0c0f5d74e153a0 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,6 +2,6 @@
   <!-- TODO: Consolidate the Publishing.props files into here. -->
   <PropertyGroup>
     <PublishingVersion>3</PublishingVersion>
-    <ProducesNetCoreAssets>true</ProducesNetCoreAssets>
+    <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
   </PropertyGroup>
 </Project>
\ No newline at end of file

From 5c03c0783841fb44bcedd5cf2ee058ffda3a439c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 22 Feb 2024 12:15:29 +0100
Subject: [PATCH 3/4] Update Publishing.props

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

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 0c0f5d74e153a0..8b796225f8274b 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,7 +1,7 @@
 <Project>
-  <!-- TODO: Consolidate the Publishing.props files into here. -->
+
   <PropertyGroup>
-    <PublishingVersion>3</PublishingVersion>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>

From 1b1f6f952e4af2c5229cc084dc65fa731d97cdc5 Mon Sep 17 00:00:00 2001
From: Milena Hristova <mhristova@microsoft.com>
Date: Fri, 23 Feb 2024 11:58:36 +0100
Subject: [PATCH 4/4] Set assets manifest metadata for assets that get shipped
 with .NET release (#98824)

* add metadata to manifest

* set in ItemDefinitionGroup

* remove from items

* comment
---
 src/installer/prepare-artifacts.proj | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index 5413e825c9513b..a9e0931c116010 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -23,6 +23,8 @@
   </PropertyGroup>
   <Import Project="../tools/Sign.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+  <Import Project="$(RepositoryEngineeringDir)Publishing.props" Condition="Exists('$(RepositoryEngineeringDir)Publishing.props')" />
+
   <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <PropertyGroup>
@@ -56,6 +58,16 @@
     <ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
   </ItemGroup>
 
+  <!-- 
+    Set metadata for assets that are not marked as NonShipping. 
+    This is used to determine if the asset should be shipped as part of .NET release.
+  -->
+  <ItemDefinitionGroup>
+    <ItemsToPush>
+      <ManifestArtifactData Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">DotNetReleaseShipping=true</ManifestArtifactData>
+    </ItemsToPush>
+  </ItemDefinitionGroup>
+
   <!--
     Run Arcade's signing project directly. The 'eng/Signing.props' extensibility props file checks
     if '$(<StageName>)' == 'true' and points Arcade to the correct files.