Skip to content

Commit f5285ff

Browse files
committed
sdk: default items
EnableDefaultItems = true EnableDefaultNoneItems = true EnableDefaultCompileItems = false DefaultLanguageSourceExtension = .php
1 parent 94459b4 commit f5285ff

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

src/Peachpie.NET.Sdk/Sdk/Sdk.props

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
55
</PropertyGroup>
66

7+
<PropertyGroup>
8+
<DefaultLanguageSourceExtension>.php</DefaultLanguageSourceExtension>
9+
10+
<!-- disable wilcard include of Compile items, file ordering is a feature -->
11+
<EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)'=='' ">false</EnableDefaultCompileItems>
12+
13+
<!-- DefaultItems.props -->
14+
<EnableDefaultItems Condition=" '$(EnableDefaultItems)' == '' ">true</EnableDefaultItems>
15+
<EnableDefaultNoneItems Condition=" '$(EnableDefaultNoneItems)' == '' ">true</EnableDefaultNoneItems>
16+
<EnableDefaultEmbeddedResourceItems Condition=" '$(EnableDefaultEmbeddedResourceItems)' == '' ">false</EnableDefaultEmbeddedResourceItems>
17+
<DefaultItemExcludes>$(DefaultItemExcludes);**/.phpstorm.meta.php/**;**/.phpstorm.meta.php</DefaultItemExcludes>
18+
</PropertyGroup>
19+
720
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk"/>
821

922
<Import Project="$(MSBuildThisFileDirectory)..\build\Peachpie.NET.Sdk.props"/>

src/Peachpie.NET.Sdk/build/Peachpie.NET.Core.Sdk.targets

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5-
<DefaultLanguageSourceExtension>.php</DefaultLanguageSourceExtension>
65
<Language>PHP</Language>
76
<TargetRuntime>Managed</TargetRuntime>
87
<AlwaysUseNumericalSuffixInItemNames>true</AlwaysUseNumericalSuffixInItemNames>
@@ -14,10 +13,9 @@
1413
<UsingTask AssemblyFile="$(PeachpieToolFullPath)" TaskName="Peachpie.NET.Sdk.Tools.BuildTask" />
1514
<UsingTask AssemblyFile="$(PeachpieToolFullPath)" TaskName="Peachpie.NET.Sdk.Tools.ComposerTask" />
1615

17-
<!-- well-known non-compile items -->
1816
<ItemGroup>
19-
<Compile Include="**/*.phar;**/*.php" Exclude="obj/**;bin/**;.*/**" Condition=" '$(EnableDefaultPeachpieCompileItems)'=='true' " />
20-
<Compile Remove="**/.phpstorm.meta.php/**;**/.phpstorm.meta.php" />
17+
<!-- well-known items -->
18+
<Compile Remove="$(DefaultItemExcludes)" />
2119
</ItemGroup>
2220

2321
<ItemGroup>

src/Peachpie.NET.Sdk/build/Peachpie.NET.Sdk.props

-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<WarningLevel>4</WarningLevel>
55

6-
<!-- disable wilcard include of Compile items, file ordering is a feature -->
7-
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
8-
96
<!-- PeachpieToolFullPath pointing to the task dll -->
107
<PeachpieToolFullPath Condition=" '$(PeachpieToolFullPath)'=='' ">$(MSBuildThisFileDirectory)../tools/Peachpie.NET.Sdk.dll</PeachpieToolFullPath>
118

@@ -16,12 +13,6 @@
1613
<LanguageTargets>$(MSBuildThisFileDirectory)Peachpie.NET.Current.Sdk.targets</LanguageTargets>
1714
</PropertyGroup>
1815

19-
<!-- default Compile and None items -->
20-
<ItemGroup>
21-
<None Include="**/*" Exclude="obj/**;bin/**;.*/**;*.msbuildproj;*.msbuildproj.user;*.sln;" />
22-
<!--Content Include="" /-->
23-
</ItemGroup>
24-
2516
<!-- current Peachpie SDK version -->
2617
<Import Project="$(MSBuildThisFileDirectory)Peachpie.Version.props" Condition=" '$(PeachpieVersion)'=='' "/>
2718

0 commit comments

Comments
 (0)