Skip to content

Commit 5730681

Browse files
committed
Fix condition for adding package readmes
Fixes #106585 The EnableDefualtPackageReadmeFile property needs to be defined before packaging.targets is imported.
1 parent 63c9565 commit 5730681

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

eng/packaging.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<PackageDesignerMarkerFile>$(MSBuildThisFileDirectory)useSharedDesignerContext.txt</PackageDesignerMarkerFile>
2323

2424
<!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
25+
<EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' == 'true'">true</EnableDefaultPackageReadmeFile>
2526
<PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFile>
2627
<PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
2728
<BeforePack>$(BeforePack);ValidatePackageReadmeExists</BeforePack>

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<SharedFrameworkName>$(MicrosoftNetCoreAppFrameworkName)</SharedFrameworkName>
77
<IsShipping Condition="'$(PgoInstrument)' != ''">false</IsShipping>
88
<SharedFrameworkFriendlyName>.NET Runtime</SharedFrameworkFriendlyName>
9-
<EnableDefaultPackageReadmeFile>true</EnableDefaultPackageReadmeFile>
109
</PropertyGroup>
1110

1211
<!--

src/mono/wasm/templates/Microsoft.NET.Runtime.WebAssembly.Templates.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<NoWarn>$(NoWarn);NU5128</NoWarn>
1717
<IsPackable>true</IsPackable>
1818
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
19+
<!-- TODO: Add package readme -->
20+
<EnableDefaultPackageReadmeFile>false</EnableDefaultPackageReadmeFile>
1921
</PropertyGroup>
2022

2123
<ItemGroup>

src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<IsShipping>true</IsShipping>
1414
<BuildingOutsideDiagnostics>false</BuildingOutsideDiagnostics>
1515
<BuildingOutsideDiagnostics Condition="'$(GitHubRepositoryName)' != 'diagnostics'">true</BuildingOutsideDiagnostics>
16+
<!-- TODO: Add package readme -->
17+
<EnableDefaultPackageReadmeFile>false</EnableDefaultPackageReadmeFile>
1618
</PropertyGroup>
1719

1820
<PropertyGroup Condition="$(BuildingOutsideDiagnostics)">

src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<IncludeBuildOutput>false</IncludeBuildOutput>
1919
<IncludeMultiTargetRoslynComponentTargets>false</IncludeMultiTargetRoslynComponentTargets>
2020
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddBuildOutputToToolsPackage</TargetsForTfmSpecificContentInPackage>
21+
<!-- TODO: Add package readme -->
22+
<EnableDefaultPackageReadmeFile>false</EnableDefaultPackageReadmeFile>
2123
</PropertyGroup>
2224

2325
<!-- Include the illink.runtimeconfig.pack.json file (which depends on the runtimeversion being built)

0 commit comments

Comments
 (0)