1.2.0

- updated project structure

Directory.Build.props

@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
 
     <!-- version -->
-    <Version Condition=" '$(Version)'=='' ">1.0.0</Version>
+    <Version Condition=" '$(Version)'=='' ">1.2.0</Version>
     <PackageVersion>$(Version)</PackageVersion>
 
     <!-- metadata generation -->
@@ -17,12 +16,11 @@
     <GenerateNeutralResourcesLanguageAttribute>true</GenerateNeutralResourcesLanguageAttribute>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
     <LangVersion>latest</LangVersion>
+    <GenerateFullPaths>true</GenerateFullPaths>
 
     <!-- signing -->
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)core.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\core.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
 
   </PropertyGroup>
@@ -33,11 +31,8 @@
     <RepositoryUrl>https://github.com/peachpiecompiler/peachpie-perlregex</RepositoryUrl>
     <PackageProjectUrl>https://github.com/peachpiecompiler/peachpie-perlregex</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)../output</PackageOutputPath>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)output</PackageOutputPath>
     <PackageIconUrl>https://github.com/peachpiecompiler/peachpie/raw/master/docs/logos/round-orange-196x196.png</PackageIconUrl>
   </PropertyGroup>
 
-  <!-- common targets -->
-  <Import Project="CommonBuild.target" />
-  
 </Project>

Peachpie.Library.RegularExpressions.sln

@@ -5,16 +5,16 @@ VisualStudioVersion = 16.0.29409.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1ED47D14-DCE0-4357-A27B-583FBE9DC2B1}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
 		LICENSE = LICENSE
 		README.md = README.md
-		build\Settings.props = build\Settings.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Peachpie.Library.RegularExpressions", "src\Peachpie.Library.RegularExpressions\Peachpie.Library.RegularExpressions.csproj", "{B028FBF4-53D7-42C7-8243-C5F0D087C892}"
 EndProject
 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}"
 EndProject
-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}"
+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}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

build/CommonBuild.target

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' or '$(TargetFramework)' == 'netstandard1.6' "
-	>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-	
-    <PackageTargetFallback Condition="'$(TargetFramework)'=='net45'"
-	>$(PackageTargetFallback);portable-net45+win8+wpa81+wp8</PackageTargetFallback>
-  </PropertyGroup>
-  
-</Project>

src/Peachpie.Library.RegularExpressions/Peachpie.Library.RegularExpressions.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\build\Settings.props" />
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageId>Peachpie.Library.RegularExpressions</PackageId>

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

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <NoWarn>CS1591</NoWarn>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 

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

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-
+    <NoWarn>CS1591</NoWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>