Set packages README correctly (#5029)

microsoft · Feb 17, 2025 · 72b12f8 · 72b12f8
1 parent 311cc69
commit 72b12f8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 29 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -11,4 +11,15 @@
     <AssemblyFileVersion>14.0.0.0</AssemblyFileVersion>
   </PropertyGroup>
 
+  <!-- Pack config -->
+  <PropertyGroup>
+    <PackageTags Condition=" '$(PackageTags)' == '' ">$(CommonPackageTags)</PackageTags>
+    <PackageReadmeFile Condition=" '$(PackageReadmeFile)' == '' and Exists('PACKAGE.md') ">PACKAGE.md</PackageReadmeFile>
+  </PropertyGroup>
+
+  <!-- Add a package README file from. -->
+  <ItemGroup Condition=" '$(PackageReadmeFile)' != '' ">
+    <None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj
@@ -10,7 +10,6 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>MSTest.Analyzers</PackageId>
-    <PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
     <PackageTags>MSTest Analyzers TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework</PackageTags>
     <PackageDescription>
       MSTest is Microsoft supported Test Framework.
@@ -29,7 +28,6 @@
 
   <ItemGroup>
     <None Update="tools\*.ps1" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="" />
-    <None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <Target Name="_GenerateGlobalConfigs">

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,4 +9,8 @@
 
   <Import Project="../Directory.Build.props" />
 
+  <!-- Pack config -->
+  <PropertyGroup>
+    <CommonPackageTags>Microsoft test testing unittest unittesting unit-testing tdd</CommonPackageTags>
+  </PropertyGroup>
 </Project>
diff --git a/src/Package/MSTest/MSTest.csproj b/src/Package/MSTest/MSTest.csproj
@@ -20,7 +20,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>MSTest</PackageId>
     <PackageTags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</PackageTags>
-    <PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
     <PackageDescription>
       MSTest is Microsoft supported Test Framework.
 
@@ -67,10 +66,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="$(MicrosoftNETTestSdkVersion)" Condition="'$(TargetFramework)' != '$(UwpMinimum)'" PrivateAssets="none" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
   <!-- SDK bottom import -->
   <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />

diff --git a/src/Platform/Directory.Build.props b/src/Platform/Directory.Build.props
@@ -15,9 +15,4 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
-  <!-- Pack config -->
-  <PropertyGroup>
-    <CommonPackageTags>Microsoft test testing unittest unittesting unit-testing tdd</CommonPackageTags>
-  </PropertyGroup>
-
 </Project>
diff --git a/src/Platform/Directory.Build.targets b/src/Platform/Directory.Build.targets