Skip to content

Commit 8c3c546

Browse files
committed
fix scope issue for directory.build.props
1 parent 2b5b0a6 commit 8c3c546

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

Directory.Build.props

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<PackageProjectUrl>https://fable-hub.github.io/Feliz/</PackageProjectUrl>
4-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
6-
<PackageReadmeFile>README.md</PackageReadmeFile>
7-
<PackageIcon>fable_logo.png</PackageIcon>
83
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
94
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
10-
<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/CHANGELOG.md"))</PackageReleaseNotes>
115
</PropertyGroup>
126
<ItemGroup>
137
<!-- Depends on the same version of FSharp.Core for all the projects -->
148
<PackageReference Include="FSharp.Core" PrivateAssets="all" />
159
</ItemGroup>
16-
<ItemGroup>
17-
<None Include="$(MSBuildThisFileDirectory)\fable_logo.png" Pack="true" PackagePath="\" />
18-
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" PackagePath="\"/>
19-
</ItemGroup>
2010
</Project>

src/Directory.Build.props

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<!-- https://learn.microsoft.com/en-us/visualstudio/msbuild/customize-by-directory?view=vs-2022#use-case-multi-level-merging -->
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="'' != $([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
<PropertyGroup>
5+
<PackageProjectUrl>https://fable-hub.github.io/Feliz/</PackageProjectUrl>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8+
<PackageReadmeFile>README.md</PackageReadmeFile>
9+
<PackageIcon>fable_logo.png</PackageIcon>
10+
<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/CHANGELOG.md"))</PackageReleaseNotes>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<None Include="$(MSBuildThisFileDirectory)\..\fable_logo.png" Pack="true" PackagePath="\" />
14+
<None Include="$(MSBuildThisFileDirectory)\..\README.md" Pack="true" PackagePath="\"/>
15+
</ItemGroup>
16+
</Project>

0 commit comments

Comments
 (0)