Skip to content

Commit bc4f5e2

Browse files
jakubmisekjakubmisek
committed
1.2.0
- updated project structure
1 parent bd7278c commit bc4f5e2

File tree

6 files changed

+85
-102
lines changed

6 files changed

+85
-102
lines changed

‎build/Settings.props renamed to ‎Directory.Build.props

+38-43
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,38 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
4-
<PropertyGroup>
5-
6-
<!-- version -->
7-
<Version Condition=" '$(Version)'=='' ">1.0.0</Version>
8-
<PackageVersion>$(Version)</PackageVersion>
9-
10-
<!-- metadata generation -->
11-
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
12-
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
13-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
14-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
15-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
16-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
17-
<GenerateNeutralResourcesLanguageAttribute>true</GenerateNeutralResourcesLanguageAttribute>
18-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19-
20-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
21-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
22-
<LangVersion>latest</LangVersion>
23-
24-
<!-- signing -->
25-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)core.snk</AssemblyOriginatorKeyFile>
26-
<SignAssembly>true</SignAssembly>
27-
28-
</PropertyGroup>
29-
30-
<!-- package -->
31-
<PropertyGroup>
32-
<RepositoryType>git</RepositoryType>
33-
<RepositoryUrl>https://github.com/peachpiecompiler/peachpie-perlregex</RepositoryUrl>
34-
<PackageProjectUrl>https://github.com/peachpiecompiler/peachpie-perlregex</PackageProjectUrl>
35-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
36-
<PackageOutputPath>$(MSBuildThisFileDirectory)../output</PackageOutputPath>
37-
<PackageIconUrl>https://github.com/peachpiecompiler/peachpie/raw/master/docs/logos/round-orange-196x196.png</PackageIconUrl>
38-
</PropertyGroup>
39-
40-
<!-- common targets -->
41-
<Import Project="CommonBuild.target" />
42-
43-
</Project>
1+
<Project>
2+
3+
<PropertyGroup>
4+
5+
<!-- version -->
6+
<Version Condition=" '$(Version)'=='' ">1.2.0</Version>
7+
<PackageVersion>$(Version)</PackageVersion>
8+
9+
<!-- metadata generation -->
10+
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
11+
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
12+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
16+
<GenerateNeutralResourcesLanguageAttribute>true</GenerateNeutralResourcesLanguageAttribute>
17+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
18+
19+
<LangVersion>latest</LangVersion>
20+
<GenerateFullPaths>true</GenerateFullPaths>
21+
22+
<!-- signing -->
23+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\core.snk</AssemblyOriginatorKeyFile>
24+
<SignAssembly>true</SignAssembly>
25+
26+
</PropertyGroup>
27+
28+
<!-- package -->
29+
<PropertyGroup>
30+
<RepositoryType>git</RepositoryType>
31+
<RepositoryUrl>https://github.com/peachpiecompiler/peachpie-perlregex</RepositoryUrl>
32+
<PackageProjectUrl>https://github.com/peachpiecompiler/peachpie-perlregex</PackageProjectUrl>
33+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
34+
<PackageOutputPath>$(MSBuildThisFileDirectory)output</PackageOutputPath>
35+
<PackageIconUrl>https://github.com/peachpiecompiler/peachpie/raw/master/docs/logos/round-orange-196x196.png</PackageIconUrl>
36+
</PropertyGroup>
37+
38+
</Project>

‎Peachpie.Library.RegularExpressions.sln

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29409.12
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1ED47D14-DCE0-4357-A27B-583FBE9DC2B1}"
7-
ProjectSection(SolutionItems) = preProject
8-
LICENSE = LICENSE
9-
README.md = README.md
10-
build\Settings.props = build\Settings.props
11-
EndProjectSection
12-
EndProject
13-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.Library.RegularExpressions", "src\Peachpie.Library.RegularExpressions\Peachpie.Library.RegularExpressions.csproj", "{B028FBF4-53D7-42C7-8243-C5F0D087C892}"
14-
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.Library.RegularExpressions.Tests", "tests\Peachpie.Library.RegularExpressions.Tests\Peachpie.Library.RegularExpressions.Tests.csproj", "{7AFF0782-D0BB-4C21-9653-694BDE110C9A}"
16-
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Peachpie.Library.RegularExpressions.Benchmarks", "tests\Peachpie.Library.RegularExpressions.Benchmarks\Peachpie.Library.RegularExpressions.Benchmarks.csproj", "{4C251EA2-F814-4437-B3AD-92712C0A997A}"
18-
EndProject
19-
Global
20-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21-
Debug|Any CPU = Debug|Any CPU
22-
Release|Any CPU = Release|Any CPU
23-
EndGlobalSection
24-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.Build.0 = Release|Any CPU
37-
EndGlobalSection
38-
GlobalSection(SolutionProperties) = preSolution
39-
HideSolutionNode = FALSE
40-
EndGlobalSection
41-
GlobalSection(ExtensibilityGlobals) = postSolution
42-
SolutionGuid = {CC3E6475-94F8-415A-AEE3-033153496D56}
43-
EndGlobalSection
44-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29409.12
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1ED47D14-DCE0-4357-A27B-583FBE9DC2B1}"
7+
ProjectSection(SolutionItems) = preProject
8+
Directory.Build.props = Directory.Build.props
9+
LICENSE = LICENSE
10+
README.md = README.md
11+
EndProjectSection
12+
EndProject
13+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.Library.RegularExpressions", "src\Peachpie.Library.RegularExpressions\Peachpie.Library.RegularExpressions.csproj", "{B028FBF4-53D7-42C7-8243-C5F0D087C892}"
14+
EndProject
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.Library.RegularExpressions.Tests", "tests\Peachpie.Library.RegularExpressions.Tests\Peachpie.Library.RegularExpressions.Tests.csproj", "{7AFF0782-D0BB-4C21-9653-694BDE110C9A}"
16+
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.Library.RegularExpressions.Benchmarks", "tests\Peachpie.Library.RegularExpressions.Benchmarks\Peachpie.Library.RegularExpressions.Benchmarks.csproj", "{4C251EA2-F814-4437-B3AD-92712C0A997A}"
18+
EndProject
19+
Global
20+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21+
Debug|Any CPU = Debug|Any CPU
22+
Release|Any CPU = Release|Any CPU
23+
EndGlobalSection
24+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25+
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26+
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.Build.0 = Debug|Any CPU
27+
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.ActiveCfg = Release|Any CPU
28+
{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.Build.0 = Release|Any CPU
37+
EndGlobalSection
38+
GlobalSection(SolutionProperties) = preSolution
39+
HideSolutionNode = FALSE
40+
EndGlobalSection
41+
GlobalSection(ExtensibilityGlobals) = postSolution
42+
SolutionGuid = {CC3E6475-94F8-415A-AEE3-033153496D56}
43+
EndGlobalSection
44+
EndGlobal

‎build/CommonBuild.target

-12
This file was deleted.

‎src/Peachpie.Library.RegularExpressions/Peachpie.Library.RegularExpressions.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\Settings.props" />
43
<PropertyGroup>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<PackageId>Peachpie.Library.RegularExpressions</PackageId>

‎tests/Peachpie.Library.RegularExpressions.Benchmarks/Peachpie.Library.RegularExpressions.Benchmarks.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5+
<NoWarn>CS1591</NoWarn>
56
<TargetFramework>netcoreapp3.0</TargetFramework>
67
</PropertyGroup>
78

‎tests/Peachpie.Library.RegularExpressions.Tests/Peachpie.Library.RegularExpressions.Tests.csproj

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

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
5-
5+
<NoWarn>CS1591</NoWarn>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

@@ -15,5 +15,5 @@
1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Peachpie.Library.RegularExpressions\Peachpie.Library.RegularExpressions.csproj" />
1717
</ItemGroup>
18-
18+
1919
</Project>

0 commit comments

Comments
 (0)