update framewk targeting and azure pipeline config

NuGet.Config

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="myget.org" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+  </packageSources>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <bindingRedirects>
+    <add key="skip" value="False" />
+  </bindingRedirects>
+  <activePackageSource>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </activePackageSource>
+</configuration>

azure-pipelines.yml

@@ -16,12 +16,17 @@ variables:
   patch: $[counter('myversioncounter', 0)]
 
 steps:
+
 - script: |
     echo Building the source
-    echo dotnet build -c $(buildConfiguration)
+    echo dotnet build -c $(buildConfiguration) -p:TargetFramework=netcoreapp2.1
   displayName: 'Building the source tree'
 
 - script: |
     dotnet test --filter "FullyQualifiedName~openCypherTranspiler.openCypherParser"
     dotnet test --filter "FullyQualifiedName~openCypherTranspiler.LogicalPlanner"
   displayName: 'Running unit regression tests that does not require Docker'
+
+- script: |
+    dotnet test --filter "FullyQualifiedName~openCypherTranspiler.SQLRenderer"
+  displayName: 'Running integration test with SQLRenderer that requires Docker'

src/Common/Common.csproj

@@ -4,7 +4,7 @@
     <IsPackable>true</IsPackable>
     <PackageId>openCypherTranspiler.Common</PackageId>
     <Description>openCypherTranspiler transpiles openCypher query language to a target relational query language, such as T-SQL.</Description>
-    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net462</TargetFrameworks>
     <RootNamespace>openCypherTranspiler.Common</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright Microsoft 2019</Copyright>

src/LogicalPlanner/LogicalPlanner.csproj

@@ -4,7 +4,7 @@
     <IsPackable>true</IsPackable>
     <PackageId>openCypherTranspiler.LogicalPlanner</PackageId>
     <Description>openCypherTranspiler transpiles openCypher query language to a target relational query language, such as T-SQL.</Description>
-    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net462</TargetFrameworks>
     <RootNamespace>openCypherTranspiler.LogicalPlanner</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright Microsoft 2019</Copyright>

src/SQLRenderer/SQLRenderer.csproj

@@ -4,7 +4,7 @@
     <IsPackable>true</IsPackable>
     <PackageId>openCypherTranspiler.SQLRenderer</PackageId>
     <Description>openCypherTranspiler transpiles openCypher query language to a target relational query language, such as T-SQL.</Description>
-    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net462</TargetFrameworks>
     <RootNamespace>openCypherTranspiler.SQLRenderer</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright Microsoft 2019</Copyright>

src/openCypherParser/openCypherParser.csproj

@@ -4,7 +4,7 @@
     <IsPackable>true</IsPackable>
     <PackageId>openCypherTranspiler.openCypherParser</PackageId>
     <Description>openCypherTranspiler transpiles openCypher query language to a target relational query language, such as T-SQL.</Description>
-    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net462</TargetFrameworks>
     <RootNamespace>openCypherTranspiler.openCypherParser</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright Microsoft 2019</Copyright>
@@ -25,7 +25,7 @@
     <PackageReference Include="Antlr4.Runtime.Standard" Version="4.7.2" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

tests/CommonTest/CommonTest.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
     <RootNamespace>openCypherTranspiler.CommonTest</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 

tests/LogicalPlanner.Test/LogicalPlanner.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />

tests/SQLRenderer.Test/SQLRenderer.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
@@ -20,6 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Docker.DotNet" Version="3.125.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />

tests/SQLRenderer.Test/SQLRendererTest.cs

@@ -21,6 +21,7 @@ using openCypherTranspiler.CommonTest;
 using openCypherTranspiler.openCypherParser;
 using openCypherTranspiler.LogicalPlanner;
 using Microsoft.Extensions.Configuration;
+using System.Collections.Generic;
 
 namespace openCypherTranspiler.SQLRenderer.Test
 {
@@ -204,7 +205,8 @@ namespace openCypherTranspiler.SQLRenderer.Test
             var goLines = movieDbCreationScript.Select(
                 (l, i) => string.Compare(l.Trim(), "go", true) == 0 || string.Compare(l.Trim(), "go;", true) == 0 ?
                     i : -1
-                ).Where(idx => idx >= 0).Append(movieDbCreationScript.Length);
+                ).Where(idx => idx >= 0)
+                .Union(new List<int>() { movieDbCreationScript.Length });
 
             using (var con = _conn_init())
             {

tests/openCypherParser.Test/openCypherParser.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net462</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />