From f245153f9523f4cd444d7c63e1537dca8a6fda82 Mon Sep 17 00:00:00 2001
From: Milena Hristova <mhristova@microsoft.com>
Date: Fri, 23 Feb 2024 11:58:36 +0100
Subject: [PATCH 1/2] 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 a4476a5d1e9d18..2de1d3b43d3a20 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>
+
   <!--
     Take assets from the build jobs, prepare them for publishing (signing, arrangement) then upload
     them to the pipeline for Arcade and custom steps to publish.

From 7d2e3391522ef928df1a66954f7ac837aa9fd99d Mon Sep 17 00:00:00 2001
From: Milena Hristova <mhristova@microsoft.com>
Date: Thu, 22 Feb 2024 16:19:00 +0100
Subject: [PATCH 2/2] Add ProducesNetCoreAssets property to Publishing.props
 (#98665)

* add property to publishing.props

* rename to ProducesDotNetReleaseShippingAssets

* Update Publishing.props

---------

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 eng/Publishing.props | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 920e79cbbd2f7c..8b796225f8274b 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -1,6 +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>