Merge pull request #133 from PositiveTechnologies/net-standard

Net Standard

Author: KvanTTT

.gitignore

@@ -208,3 +208,4 @@ FakesAssemblies/
 # ANTLR Generated files
 **/Generated/*
 
+launchSettings.json

.travis.yml

@@ -6,19 +6,15 @@ UST). At present time C\#, Java, PHP, PL/SQL, T-SQL, and JavaScript
 are supported. Patterns can be described within the code or using a
 domain-specific language (DSL).
 
-| Windows Build Status | Linux Build Status |
-|---|---|
-| [![Windows Build Status](https://ci.appveyor.com/api/projects/status/vo0acpvek4q1x8yh?svg=true)](https://ci.appveyor.com/project/KvanTTT/pt-pm) | [![Linux/Mac Build Status](https://api.travis-ci.org/PositiveTechnologies/PT.PM.svg?branch=master)](https://travis-ci.org/PositiveTechnologies/PT.PM) |
+## Build Status (Windows & Linux)
 
-## NuGet and Artifacts
+[![Windows & Linux Build Status](https://ci.appveyor.com/api/projects/status/vo0acpvek4q1x8yh?svg=true)](https://ci.appveyor.com/project/KvanTTT/pt-pm) 
 
-The last nightly packages can be found here: [https://ci.appveyor.com/nuget/pt-pm-mk0aj1y5uned](https://ci.appveyor.com/nuget/pt-pm-mk0aj1y5uned). See an article [Using nightly build feed](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed) for custom package source adding.
-
-Artifacts also available: [https://ci.appveyor.com/project/KvanTTT/pt-pm/build/artifacts](https://ci.appveyor.com/project/KvanTTT/pt-pm/build/artifacts).
+Artifacts are also available.
 
 ## Documentation
 
-See a [wiki section](https://github.com/PositiveTechnologies/PT.PM/wiki) and articles at [PT.Doc](https://github.com/PositiveTechnologies/PT.Doc).
+See a [Wiki Section](https://github.com/PositiveTechnologies/PT.PM/wiki) and articles at [PT.Doc](https://github.com/PositiveTechnologies/PT.Doc).
 
 ## License
 

PT.PM.Cli.nuspec

@@ -1,25 +1,10 @@
 using System;
 using System.Reflection;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyCompany("Positive Technologies")]
 [assembly: AssemblyProduct("PT.PM")]
-[assembly: AssemblyCopyright("Copyright © Positive Technologies 2015-2017")]
+[assembly: AssemblyCopyright("Copyright © Positive Technologies 2015-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: CLSCompliant(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-// [assembly: AssemblyFileVersion("1.0.5.*")]

PT.PM.nuspec

@@ -1,75 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2B5519C9-4566-4743-A14A-66234299CDB8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PT.PM.AntlrUtils</RootNamespace>
-    <AssemblyName>PT.PM.AntlrUtils</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Compile Include="..\AssemblyInfoCommon.cs" Link="AssemblyInfoCommon.cs" />
+    <PackageReference Include="Antlr4.Runtime" Version="4.6.5-beta002" />
+    
+    <ProjectReference Include="..\PT.PM.Common\PT.PM.Common.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AntlrParseTree.cs" />
-    <Compile Include="AntlrCaseInsensitiveInputStream.cs" />
-    <Compile Include="AntlrDumper.cs" />
-    <Compile Include="AntlrUtils.cs" />
-    <Compile Include="AntlrMemoryErrorListener.cs" />
-    <Compile Include="AntlrParser.cs" />
-    <Compile Include="AntlrConverter.cs" />
-    <Compile Include="CaseInsensitiveType.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\AssemblyInfoCommon.cs">
-      <Link>Properties\AssemblyInfoCommon.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PT.PM.Common\PT.PM.Common.csproj">
-      <Project>{0b10dbae-c18d-4007-b799-0b3b1e00376e}</Project>
-      <Name>PT.PM.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>

README.md

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using PT.PM.Common.Nodes.GeneralScope;
 using System.IO;
+using System;
 
 namespace PT.PM.CSharpParseTreeUst.Tests
 {
@@ -25,7 +26,7 @@ public void Convert_CSharp_BaseTypesExist()
             bool result = ust.AnyDescendant(descendant =>
             {
                 return descendant is TypeDeclaration typeDeclaration &&
-                       typeDeclaration.BaseTypes.Any(type => type.TypeText == "IDisposable");
+                       typeDeclaration.BaseTypes.Any(type => type.TypeText == nameof(IDisposable));
             });
             Assert.IsTrue(result, "Ust doesn't contain type declaration node with IDisposable base type");
         }

Sources/AspxParser

@@ -8,6 +8,7 @@ namespace PT.PM.CSharpParseTreeUst.Tests
     [TestFixture]
     public class CSharpParserTests
     {
+        [Test]
         public void Parse_CSharpWithRoslyn()
         {
             TestUtility.CheckFile(Path.Combine(TestUtility.GrammarsDirectory, "csharp", "not-ready-examples", "AllInOne.cs"),