Skip to content

Commit 2dc8dce

Browse files
jakubmisekjakubmisek
committed
updated project structure
- Directory.Build.props - Directory.Build.targets - cleaned nuget.config
1 parent 41d8520 commit 2dc8dce

File tree

29 files changed

+20
-59
lines changed

29 files changed

+20
-59
lines changed

‎build/Targets/Settings.props ‎Directory.Build.props

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project>
32

43
<PropertyGroup>
54

@@ -22,9 +21,9 @@
2221
<LangVersion>latest</LangVersion>
2322

2423
<!-- signing -->
25-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)../StrongKeys/core.snk</AssemblyOriginatorKeyFile>
24+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build/StrongKeys/core.snk</AssemblyOriginatorKeyFile>
2625
<SignAssembly>true</SignAssembly>
27-
26+
2827
<!-- SourceLink -->
2928
<PublishRepositoryUrl>true</PublishRepositoryUrl>
3029
<EmbedUntrackedSources>false</EmbedUntrackedSources>
@@ -40,13 +39,10 @@
4039
<RepositoryType>git</RepositoryType>
4140
<RepositoryUrl>https://github.com/peachpiecompiler/peachpie</RepositoryUrl>
4241
<PackageProjectUrl>https://github.com/peachpiecompiler/peachpie</PackageProjectUrl>
43-
<PackageOutputPath>$(MSBuildThisFileDirectory)../../.nugs</PackageOutputPath>
42+
<PackageOutputPath>$(MSBuildThisFileDirectory).nugs</PackageOutputPath>
4443
<PackageIconUrl>https://github.com/peachpiecompiler/peachpie/raw/master/docs/logos/round-orange-196x196.png</PackageIconUrl>
4544
<Authors>iolevel,peachpiecompiler</Authors>
4645
<NoWarn>$(NoWarn),NU5048</NoWarn>
4746
</PropertyGroup>
4847

49-
<!-- common targets -->
50-
<Import Project="CommonBuild.target" />
51-
5248
</Project>

‎build/Targets/CommonBuild.target ‎Directory.Build.targets

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
32

43
<PropertyGroup>
5-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' or '$(TargetFramework)' == 'netstandard1.6' "
6-
>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
7-
8-
<PackageTargetFallback Condition="'$(TargetFramework)'=='net45'"
9-
>$(PackageTargetFallback);portable-net45+win8+wpa81+wp8</PackageTargetFallback>
4+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' or '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
5+
<PackageTargetFallback Condition="'$(TargetFramework)'=='net45'">$(PackageTargetFallback);portable-net45+win8+wpa81+wp8</PackageTargetFallback>
106
</PropertyGroup>
117

128
<!-- SourceLink -->
@@ -16,5 +12,5 @@
1612
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1713
</PackageReference>
1814
</ItemGroup>
19-
15+
2016
</Project>

‎NuGet.Config

+2-13
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,9 @@
22
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
33

44
<configuration>
5-
<solution>
6-
<add key="disableSourceControlIntegration" value="true" />
7-
</solution>
8-
<config>
9-
<add key="repositoryPath" value="../packages" />
10-
</config>
115
<packageSources>
12-
<clear />
13-
<add key="Peachpie Debug Packages" value=".nugs" />
14-
<add key="myget.org dotnet-coreclr" value="https://www.myget.org/F/dotnet-coreclr/api/v3/index.json" />
15-
<add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
16-
<add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/api/v3/index.json" />
17-
<add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v3/index.json" />
18-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
<!-- folder with debug builds, nuget restore finds them and installs them into its cache -->
7+
<add key="Peachpie Debug Packages" value=".nugs" />
198
</packageSources>
209

2110
</configuration>

‎Peachpie.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{ED9DAD46
99
ProjectSection(SolutionItems) = preProject
1010
.travis.yml = .travis.yml
1111
build\build.ps1 = build\build.ps1
12-
build\Targets\CommonBuild.target = build\Targets\CommonBuild.target
12+
Directory.Build.props = Directory.Build.props
13+
Directory.Build.targets = Directory.Build.targets
1314
MyGet.ps1 = MyGet.ps1
14-
build\Targets\Settings.props = build\Targets\Settings.props
1515
build\update-cache.ps1 = build\update-cache.ps1
1616
EndProjectSection
1717
EndProject

‎src/Compiler/peach/peach.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFramework>net461</TargetFramework>
65
<AssemblyName>peach</AssemblyName>

‎src/PDO/Peachpie.Library.PDO.Firebird/Peachpie.Library.PDO.Firebird.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/PDO/Peachpie.Library.PDO.IBM/Peachpie.Library.PDO.IBM.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/PDO/Peachpie.Library.PDO.MySQL/Peachpie.Library.PDO.MySQL.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/PDO/Peachpie.Library.PDO.PgSQL/Peachpie.Library.PDO.PgSQL.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/PDO/Peachpie.Library.PDO.SqlSrv/Peachpie.Library.PDO.SqlSrv.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/PDO/Peachpie.Library.PDO.Sqlite/Peachpie.Library.PDO.Sqlite.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PreserveCompilationContext>true</PreserveCompilationContext>

‎src/PDO/Peachpie.Library.PDO/Peachpie.Library.PDO.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<AssemblyName>Peachpie.Library.PDO</AssemblyName>

‎src/Peachpie.App/Peachpie.App.csproj

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<Description>Peachpie platform dependencies.</Description>
6-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5+
<TargetFramework>netstandard2.0</TargetFramework>
76
<AssemblyName>Peachpie.App</AssemblyName>
87
<PackageId>Peachpie.App</PackageId>
98
<IncludeBuildOutput>false</IncludeBuildOutput>
@@ -12,15 +11,15 @@
1211
</PropertyGroup>
1312

1413
<ItemGroup>
15-
<ProjectReference Include="..\PDO\Peachpie.Library.PDO\Peachpie.Library.PDO.csproj" />
16-
<ProjectReference Include="..\Peachpie.Library.Scripting\Peachpie.Library.Scripting.csproj" />
1714
<ProjectReference Include="..\Peachpie.Runtime\Peachpie.Runtime.csproj" />
1815
<ProjectReference Include="..\Peachpie.Library\Peachpie.Library.csproj" />
19-
<ProjectReference Include="..\Peachpie.Library.MsSql\Peachpie.Library.MsSql.csproj" />
20-
<ProjectReference Include="..\Peachpie.Library.MySql\Peachpie.Library.MySql.csproj" />
21-
<ProjectReference Include="..\Peachpie.Library.XmlDom\Peachpie.Library.XmlDom.csproj" />
2216
<ProjectReference Include="..\Peachpie.Library.Network\Peachpie.Library.Network.csproj" />
17+
<ProjectReference Include="..\Peachpie.Library.XmlDom\Peachpie.Library.XmlDom.csproj" />
2318
<ProjectReference Include="..\Peachpie.Library.Graphics\Peachpie.Library.Graphics.csproj" />
19+
<ProjectReference Include="..\Peachpie.Library.Scripting\Peachpie.Library.Scripting.csproj" />
20+
<ProjectReference Include="..\Peachpie.Library.MySql\Peachpie.Library.MySql.csproj" />
21+
<ProjectReference Include="..\Peachpie.Library.MsSql\Peachpie.Library.MsSql.csproj" />
22+
<ProjectReference Include="..\PDO\Peachpie.Library.PDO\Peachpie.Library.PDO.csproj" />
2423
</ItemGroup>
2524

2625
</Project>

‎src/Peachpie.AspNetCore.Mvc/Peachpie.AspNetCore.Mvc.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.1</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591</NoWarn>

‎src/Peachpie.AspNetCore.Web/Peachpie.AspNetCore.Web.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.1</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591</NoWarn>

‎src/Peachpie.CodeAnalysis/Peachpie.CodeAnalysis.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591</NoWarn>

‎src/Peachpie.Library.Graphics/Peachpie.Library.Graphics.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591;1574</NoWarn>

‎src/Peachpie.Library.MsSql/Peachpie.Library.MsSql.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<AssemblyName>Peachpie.Library.MsSql</AssemblyName>

‎src/Peachpie.Library.MySql/Peachpie.Library.MySql.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<AssemblyName>Peachpie.Library.MySql</AssemblyName>

‎src/Peachpie.Library.Network/Peachpie.Library.Network.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591;1574</NoWarn>

‎src/Peachpie.Library.Scripting/Peachpie.Library.Scripting.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591;1574</NoWarn>

‎src/Peachpie.Library.XmlDom/Peachpie.Library.XmlDom.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591;1574</NoWarn>

‎src/Peachpie.Library/Peachpie.Library.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591;1574</NoWarn>

‎src/Peachpie.NET.Sdk/Peachpie.NET.Sdk.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFramework>netstandard2.0</TargetFramework>
65
<AssemblyName>Peachpie.NET.Sdk</AssemblyName>

‎src/Peachpie.RequestHandler/Peachpie.RequestHandler.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>net461</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591</NoWarn>

‎src/Peachpie.Runtime/Peachpie.Runtime.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<NoWarn>$(NoWarn);1591</NoWarn>

‎src/Tests/Peachpie.DiagnosticTests/Peachpie.DiagnosticTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="..\..\..\build\Targets\Settings.props" />
43
<PropertyGroup>
54
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<NoWarn>$(NoWarn);1591</NoWarn>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Tests/Peachpie.Runtime.Tests/Peachpie.Runtime.Tests.csproj

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

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<NoWarn>$(NoWarn);1591</NoWarn>
56
</PropertyGroup>
67

78
<ItemGroup>

‎src/Tests/Peachpie.Test/Peachpie.Test.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp3.0</TargetFramework>
6+
<NoWarn>$(NoWarn);1591</NoWarn>
67
</PropertyGroup>
78

89
<ItemGroup>

0 commit comments

Comments
 (0)