From fb9f24a7f842a622e6449a75c60bfcc74a1a5b2f Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 11 Sep 2024 10:35:52 -0700
Subject: [PATCH 1/5] Include Readme.md in packages

---
 Directory.Build.props | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index a727412840a4..748b2eb34941 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -239,6 +239,20 @@
     <ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
+    <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' == 'true'">true</EnableDefaultPackageReadmeFile>
+    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFile>
+    <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
+    <!-- Uncomment this once all packages have ReadMes -->
+    <!-- <BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack> -->
+  </PropertyGroup>
+
+  <!-- Add a package README file -->
+  <ItemGroup Condition="'$(PackageReadmeFilePath)' != '' and Exists('$(PackageReadmeFilePath)' )">
+    <None Include="$(PackageReadmeFilePath)" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- Set the arcade before common targets so we compute ExcludeFromBuild before arcade uses it. -->
     <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>

From e134410f9c0cc947fb5e6589b26a9da9a462186d Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 11 Sep 2024 12:51:28 -0700
Subject: [PATCH 2/5] Fix

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 748b2eb34941..a9d0cb4ccdf6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -241,7 +241,7 @@
 
   <PropertyGroup>
     <!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
-    <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' == 'true'">true</EnableDefaultPackageReadmeFile>
+    <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>
     <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFile>
     <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
     <!-- Uncomment this once all packages have ReadMes -->

From 5cfa3826456511ad6c66768e5d9172fa973737d8 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 11 Sep 2024 13:02:51 -0700
Subject: [PATCH 3/5] Try this

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a9d0cb4ccdf6..61a2a700775c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -242,8 +242,8 @@
   <PropertyGroup>
     <!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
     <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>
-    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFile>
     <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
+    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true' and Exists('$(PackageReadmeFilePath)'">PACKAGE.md</PackageReadmeFile>
     <!-- Uncomment this once all packages have ReadMes -->
     <!-- <BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack> -->
   </PropertyGroup>

From 82af04d47e43e5c182148d7b70a4900047303407 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 11 Sep 2024 13:07:01 -0700
Subject: [PATCH 4/5] Fix syntax

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 61a2a700775c..cf24e54f7d67 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -243,7 +243,7 @@
     <!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
     <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>
     <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
-    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true' and Exists('$(PackageReadmeFilePath)'">PACKAGE.md</PackageReadmeFile>
+    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true' and Exists('$(PackageReadmeFilePath)' )">PACKAGE.md</PackageReadmeFile>
     <!-- Uncomment this once all packages have ReadMes -->
     <!-- <BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack> -->
   </PropertyGroup>

From debcfe20ce7165c6f5c9267a2e301be5ec64ddfd Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 11 Sep 2024 15:26:06 -0700
Subject: [PATCH 5/5] Remove bad ref

---
 Directory.Build.props | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index cf24e54f7d67..499cf17df265 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -244,8 +244,6 @@
     <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>
     <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
     <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true' and Exists('$(PackageReadmeFilePath)' )">PACKAGE.md</PackageReadmeFile>
-    <!-- Uncomment this once all packages have ReadMes -->
-    <!-- <BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack> -->
   </PropertyGroup>
 
   <!-- Add a package README file -->