Skip to content

Commit efd5256

Browse files
[rel/3.8] Set packages README correctly (#5030)
Co-authored-by: Youssef1313 <youssefvictor00@gmail.com>
1 parent 2e2607a commit efd5256

File tree

6 files changed

+15
-29
lines changed

6 files changed

+15
-29
lines changed

Directory.Build.targets

+11
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,15 @@
1111
<AssemblyFileVersion>14.0.0.0</AssemblyFileVersion>
1212
</PropertyGroup>
1313

14+
<!-- Pack config -->
15+
<PropertyGroup>
16+
<PackageTags Condition=" '$(PackageTags)' == '' ">$(CommonPackageTags)</PackageTags>
17+
<PackageReadmeFile Condition=" '$(PackageReadmeFile)' == '' and Exists('PACKAGE.md') ">PACKAGE.md</PackageReadmeFile>
18+
</PropertyGroup>
19+
20+
<!-- Add a package README file from. -->
21+
<ItemGroup Condition=" '$(PackageReadmeFile)' != '' ">
22+
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
23+
</ItemGroup>
24+
1425
</Project>

src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<PropertyGroup>
1111
<IsPackable>true</IsPackable>
1212
<PackageId>MSTest.Analyzers</PackageId>
13-
<PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
1413
<PackageTags>MSTest Analyzers TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework</PackageTags>
1514
<PackageDescription>
1615
MSTest is Microsoft supported Test Framework.
@@ -29,7 +28,6 @@
2928

3029
<ItemGroup>
3130
<None Update="tools\*.ps1" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="" />
32-
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
3331
</ItemGroup>
3432

3533
<Target Name="_GenerateGlobalConfigs">

src/Directory.Build.props

+4
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@
99

1010
<Import Project="../Directory.Build.props" />
1111

12+
<!-- Pack config -->
13+
<PropertyGroup>
14+
<CommonPackageTags>Microsoft test testing unittest unittesting unit-testing tdd</CommonPackageTags>
15+
</PropertyGroup>
1216
</Project>

src/Package/MSTest/MSTest.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<IsPackable>true</IsPackable>
2121
<PackageId>MSTest</PackageId>
2222
<PackageTags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</PackageTags>
23-
<PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
2423
<PackageDescription>
2524
MSTest is Microsoft supported Test Framework.
2625

@@ -67,10 +66,6 @@
6766
<PackageReference Include="Microsoft.NET.Test.Sdk" VersionOverride="$(MicrosoftNETTestSdkVersion)" Condition="'$(TargetFramework)' != '$(UwpMinimum)'" PrivateAssets="none" />
6867
</ItemGroup>
6968

70-
<ItemGroup>
71-
<None Include="$(PackageReadmeFile)" Pack="true" PackagePath="\" />
72-
</ItemGroup>
73-
7469
<!-- SDK bottom import -->
7570
<Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
7671
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />

src/Platform/Directory.Build.props

-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@
1515
<IsPackable>true</IsPackable>
1616
</PropertyGroup>
1717

18-
<!-- Pack config -->
19-
<PropertyGroup>
20-
<CommonPackageTags>Microsoft test testing unittest unittesting unit-testing tdd</CommonPackageTags>
21-
</PropertyGroup>
22-
2318
</Project>

src/Platform/Directory.Build.targets

-17
This file was deleted.

0 commit comments

Comments
 (0)