From 6ef5f329be38be570c4188eaa2941b2af626be17 Mon Sep 17 00:00:00 2001
From: Clovis Coli Jr <colijunior@gmail.com>
Date: Mon, 15 Oct 2018 13:38:06 -0300
Subject: [PATCH] =?UTF-8?q?Convers=C3=A3o=20para=20.Net=20Standard=202.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |  1 +
 Kendo.DynamicLinq/Kendo.DynamicLinq.csproj   | 78 +++++---------------
 Kendo.DynamicLinq/Kendo.DynamicLinq.nuspec   | 16 ----
 Kendo.DynamicLinq/Properties/AssemblyInfo.cs | 33 ---------
 Kendo.DynamicLinq/QueryableExtensions.cs     |  8 +-
 Kendo.DynamicLinq/packages.config            |  4 -
 6 files changed, 25 insertions(+), 115 deletions(-)
 delete mode 100644 Kendo.DynamicLinq/Kendo.DynamicLinq.nuspec
 delete mode 100644 Kendo.DynamicLinq/Properties/AssemblyInfo.cs
 delete mode 100644 Kendo.DynamicLinq/packages.config

diff --git a/.gitignore b/.gitignore
index 3e3695c..8416d50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ x64/
 *.Publish.xml
 
 Kendo.DynamicLinq.*.nupkg
+/.vs/Kendo.DynamicLinq/v15/Server/sqlite3
diff --git a/Kendo.DynamicLinq/Kendo.DynamicLinq.csproj b/Kendo.DynamicLinq/Kendo.DynamicLinq.csproj
index 3c5fd88..9b26eae 100644
--- a/Kendo.DynamicLinq/Kendo.DynamicLinq.csproj
+++ b/Kendo.DynamicLinq/Kendo.DynamicLinq.csproj
@@ -1,64 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2BD75D53-E0EA-4995-8B0F-60AD709945AC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Kendo.DynamicLinq</RootNamespace>
-    <AssemblyName>Kendo.DynamicLinq</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Copyright>Codout</Copyright>
+    <PackageLicenseUrl></PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/Codout/dlinq-helpers</PackageProjectUrl>
+    <PackageIconUrl>https://github.com/Codout/Codout.Framework/raw/master/logo-nuget.png</PackageIconUrl>
+    <RepositoryUrl>https://github.com/Codout/dlinq-helpers</RepositoryUrl>
+    <PackageTags>Codout, Kendo</PackageTags>
+    <PackageReleaseNotes>Conversão para .Net Standard 2.0</PackageReleaseNotes>
+    <PackageId>Codout.Kendo.DynamicLinq</PackageId>
+    <Authors>Codout.Kendo.DynamicLinq</Authors>
+    <Company>Codout.Kendo.DynamicLinq</Company>
+    <Product>Codout.Kendo.DynamicLinq</Product>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <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>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Linq.Dynamic">
-      <HintPath>..\packages\System.Linq.Dynamic.1.0.0\lib\net40\System.Linq.Dynamic.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Aggregate.cs" />
-    <Compile Include="DataSourceRequest.cs" />
-    <Compile Include="DataSourceResult.cs" />
-    <Compile Include="Filter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="QueryableExtensions.cs" />
-    <Compile Include="Sort.cs" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.18" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="Kendo.DynamicLinq.nuspec" />
-    <None Include="packages.config" />
+    <Folder Include="Properties\" />
   </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>
\ No newline at end of file
+
+</Project>
diff --git a/Kendo.DynamicLinq/Kendo.DynamicLinq.nuspec b/Kendo.DynamicLinq/Kendo.DynamicLinq.nuspec
deleted file mode 100644
index 762834c..0000000
--- a/Kendo.DynamicLinq/Kendo.DynamicLinq.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>Atanas Korchev</authors>
-    <projectUrl>https://github.com/kendo-labs/dlinq-helpers</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>Copyright 2013</copyright>
-    <dependencies>
-      <dependency id="System.Linq.Dynamic" version="1.0.0" />
-    </dependencies>
-  </metadata>
-</package>
diff --git a/Kendo.DynamicLinq/Properties/AssemblyInfo.cs b/Kendo.DynamicLinq/Properties/AssemblyInfo.cs
deleted file mode 100644
index 87ed600..0000000
--- a/Kendo.DynamicLinq/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// 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: AssemblyTitle("Kendo.DynamicLinq")]
-[assembly: AssemblyDescription("Server side paging, sorting and filtering via Dynamic Linq")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Kendo.DynamicLinq")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("969930e8-6f3d-4369-bdc1-835628cd125f")]
-
-// 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.1.2.0")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
diff --git a/Kendo.DynamicLinq/QueryableExtensions.cs b/Kendo.DynamicLinq/QueryableExtensions.cs
index 7944e12..a5abe82 100644
--- a/Kendo.DynamicLinq/QueryableExtensions.cs
+++ b/Kendo.DynamicLinq/QueryableExtensions.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Dynamic;
+using System.Linq.Dynamic.Core;
 using System.Linq.Expressions;
-using DynamicExpression = System.Linq.Dynamic.DynamicExpression;
 
 namespace Kendo.DynamicLinq
 {
@@ -123,14 +122,15 @@ private static object Aggregate<T>(IQueryable<T> queryable, IEnumerable<Aggregat
 
 						fieldProps.Add(new DynamicProperty(aggregate.Aggregate, typeof(object)), val);
 					}
-					type = DynamicExpression.CreateClass(fieldProps.Keys);
+				    
+                    type = DynamicClassFactory.CreateType(fieldProps.Select(x => x.Key).ToList());
 					var fieldObj = Activator.CreateInstance(type);
 					foreach (var p in fieldProps.Keys)
 						type.GetProperty(p.Name).SetValue(fieldObj, fieldProps[p], null);
 					objProps.Add(new DynamicProperty(group.Key, fieldObj.GetType()), fieldObj);
 				}
 
-				type = DynamicExpression.CreateClass(objProps.Keys);
+				type = DynamicClassFactory.CreateType(objProps.Select(x => x.Key).ToList());
 
 				var obj = Activator.CreateInstance(type);
 
diff --git a/Kendo.DynamicLinq/packages.config b/Kendo.DynamicLinq/packages.config
deleted file mode 100644
index 616a92b..0000000
--- a/Kendo.DynamicLinq/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="System.Linq.Dynamic" version="1.0.0" targetFramework="net40" />
-</packages>
\ No newline at end of file