1.2.0

- updated project structure
peachpiecompiler · Mar 8, 2020 · bc4f5e2 · bc4f5e2
1 parent bd7278c
commit bc4f5e2
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 102 deletions.
diff --git a/build/Settings.props → Directory.Build.props b/build/Settings.props → Directory.Build.props
@@ -1,43 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-
-    <!-- version -->
-    <Version Condition=" '$(Version)'=='' ">1.0.0</Version>
-    <PackageVersion>$(Version)</PackageVersion>
-
-    <!-- metadata generation -->
-    <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-    <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>
-
-    <!-- signing -->
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)core.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-
-  </PropertyGroup>
-
-  <!-- package -->
-  <PropertyGroup>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/peachpiecompiler/peachpie-perlregex</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/peachpiecompiler/peachpie-perlregex</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <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>
+<Project>
+
+  <PropertyGroup>
+
+    <!-- version -->
+    <Version Condition=" '$(Version)'=='' ">1.2.0</Version>
+    <PackageVersion>$(Version)</PackageVersion>
+
+    <!-- metadata generation -->
+    <GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateNeutralResourcesLanguageAttribute>true</GenerateNeutralResourcesLanguageAttribute>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <LangVersion>latest</LangVersion>
+    <GenerateFullPaths>true</GenerateFullPaths>
+
+    <!-- signing -->
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\core.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+
+  </PropertyGroup>
+
+  <!-- package -->
+  <PropertyGroup>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/peachpiecompiler/peachpie-perlregex</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/peachpiecompiler/peachpie-perlregex</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)output</PackageOutputPath>
+    <PackageIconUrl>https://github.com/peachpiecompiler/peachpie/raw/master/docs/logos/round-orange-196x196.png</PackageIconUrl>
+  </PropertyGroup>
+
+</Project>
diff --git a/Peachpie.Library.RegularExpressions.sln b/Peachpie.Library.RegularExpressions.sln
@@ -1,44 +1,44 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 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
-		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}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CC3E6475-94F8-415A-AEE3-033153496D56}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 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
+	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("{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
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B028FBF4-53D7-42C7-8243-C5F0D087C892}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AFF0782-D0BB-4C21-9653-694BDE110C9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C251EA2-F814-4437-B3AD-92712C0A997A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CC3E6475-94F8-415A-AEE3-033153496D56}
+	EndGlobalSection
+EndGlobal
diff --git a/build/CommonBuild.target b/build/CommonBuild.target
diff --git a/src/Peachpie.Library.RegularExpressions/Peachpie.Library.RegularExpressions.csproj b/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>

diff --git a/...brary.RegularExpressions.Benchmarks/Peachpie.Library.RegularExpressions.Benchmarks.csproj b/...brary.RegularExpressions.Benchmarks/Peachpie.Library.RegularExpressions.Benchmarks.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <NoWarn>CS1591</NoWarn>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 

diff --git a/...eachpie.Library.RegularExpressions.Tests/Peachpie.Library.RegularExpressions.Tests.csproj b/...eachpie.Library.RegularExpressions.Tests/Peachpie.Library.RegularExpressions.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-
+    <NoWarn>CS1591</NoWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -15,5 +15,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Peachpie.Library.RegularExpressions\Peachpie.Library.RegularExpressions.csproj" />
   </ItemGroup>
-  
+
 </Project>