Skip to content

Remove useless dependences #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefH merged 7 commits into from
Apr 29, 2016
Merged

Remove useless dependences #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fd566f
build fix
yyjdelete Apr 28, 2016
90258a5
Try remove directly dependence of System.Data.Entity(EF5), add suppor…
yyjdelete Apr 28, 2016
d70acc0
Remove nuget dependence of JetBrains.Annotations
yyjdelete Apr 28, 2016
7c691b6
Fix usage of GetType
yyjdelete Apr 28, 2016
8d2a6ae
Add support for fullname of type, Allow overwrite
yyjdelete Apr 28, 2016
14a6ac9
System.Data.Entity is always here, so overwrite short name of it with…
yyjdelete Apr 29, 2016
d19a440
Less dependencies for dnxcore5 and dotnet54
yyjdelete Apr 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 71 additions & 29 deletions src/System.Linq.Dynamic.Core/ExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,32 +205,29 @@ interface IEnumerableSignatures
{ "bool", typeof(bool) },
{ "float", typeof(float) },
};
static readonly HashSet<Type> _predefinedTypes = new HashSet<Type>() {
typeof(object),
typeof(bool),
typeof(char),
typeof(string),
typeof(sbyte),
typeof(byte),
typeof(short),
typeof(ushort),
typeof(int),
typeof(uint),
typeof(long),
typeof(ulong),
typeof(float),
typeof(double),
typeof(decimal),
typeof(DateTime),
typeof(DateTimeOffset),
typeof(TimeSpan),
typeof(Guid),
typeof(Math),
typeof(Convert),
typeof(Uri),
#if !(NET35 || SILVERLIGHT || NETFX_CORE || DNXCORE50 || DOTNET5_4 || NETSTANDARD)
typeof(Data.Objects.EntityFunctions)
#endif
static readonly Dictionary<Type, int> _predefinedTypes = new Dictionary<Type, int>() {
{ typeof(object), 0 },
{ typeof(bool), 0 },
{ typeof(char), 0 },
{ typeof(string), 0 },
{ typeof(sbyte), 0 },
{ typeof(byte), 0 },
{ typeof(short), 0 },
{ typeof(ushort), 0 },
{ typeof(int), 0 },
{ typeof(uint), 0 },
{ typeof(long), 0 },
{ typeof(ulong), 0 },
{ typeof(float), 0 },
{ typeof(double), 0 },
{ typeof(decimal), 0 },
{ typeof(DateTime), 0 },
{ typeof(DateTimeOffset), 0 },
{ typeof(TimeSpan), 0 },
{ typeof(Guid), 0 },
{ typeof(Math), 0 },
{ typeof(Convert), 0 },
{ typeof(Uri), 0 }
};

// These aliases are supposed to simply the where clause and make it more human readable
Expand Down Expand Up @@ -279,6 +276,43 @@ interface IEnumerableSignatures
char _ch;
Token _token;

static ExpressionParser()
{
#if !(NET35 || SILVERLIGHT || NETFX_CORE || DNXCORE50 || DOTNET5_4 || NETSTANDARD)
try
{
//System.Data.Entity is always here, so overwrite short name of it with EntityFramework if EntityFramework is found.
Type efType;
//EF5(or 4.x??), System.Data.Objects.DataClasses.EdmFunctionAttribute
//There is also an System.Data.Entity, Version=3.5.0.0, but no Functions.
efType = Type.GetType("System.Data.Objects.EntityFunctions, System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 1);
efType = Type.GetType("System.Data.Objects.SqlClient.SqlFunctions, System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 1);
efType = Type.GetType("System.Data.Objects.SqlClient.SqlSpatialFunctions, System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 1);

//EF6,System.Data.Entity.DbFunctionAttribute
efType = Type.GetType("System.Data.Entity.Core.Objects.EntityFunctions, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 2);
efType = Type.GetType("System.Data.Entity.DbFunctions, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 2);
efType = Type.GetType("System.Data.Entity.SqlServer.SqlFunctions, EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 2);
efType = Type.GetType("System.Data.Entity.SqlServer.SqlSpatialFunctions, EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
if (efType != null)
_predefinedTypes.Add(efType, 2);
}
catch { }
#endif
}

public ExpressionParser(ParameterExpression[] parameters, string expression, object[] values)
{
if (_keywords == null) _keywords = CreateKeywords();
Expand Down Expand Up @@ -1326,7 +1360,7 @@ Expression ParseElementAccess(Expression expr)

static bool IsPredefinedType(Type type)
{
if (_predefinedTypes.Contains(type)) return true;
if (_predefinedTypes.ContainsKey(type)) return true;
if (GlobalConfig.CustomTypeProvider.GetCustomTypes().Contains(type)) return true;

return false;
Expand Down Expand Up @@ -2468,9 +2502,17 @@ static Dictionary<string, object> CreateKeywords()
d.Add(KEYWORD_IIF, KEYWORD_IIF);
d.Add(KEYWORD_NEW, KEYWORD_NEW);

foreach (Type type in _predefinedTypes) d.Add(type.Name, type);
foreach (Type type in _predefinedTypes.OrderBy(kvp => kvp.Value).Select(kvp => kvp.Key))
{
d[type.FullName] = type;
d[type.Name] = type;
}
foreach (KeyValuePair<string, Type> pair in _predefinedTypesShorthands) d.Add(pair.Key, pair.Value);
foreach (Type type in GlobalConfig.CustomTypeProvider.GetCustomTypes()) d.Add(type.Name, type);
foreach (Type type in GlobalConfig.CustomTypeProvider.GetCustomTypes())
{
d[type.FullName] = type;
d[type.Name] = type;
}

return d;
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Linq.Dynamic.Core/GroupResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class GroupResult
/// </summary>
public override string ToString()
{
return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", Key, Count);
return string.Format(CultureInfo.CurrentCulture, "{0} ({1})", ((object)Key).ToString(), Count);
}
}
}
107 changes: 19 additions & 88 deletions src/System.Linq.Dynamic.Core/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,145 +13,76 @@
"compilationOptions": {
},

"dependencies": {
"JetBrains.Annotations": {
"version": "10.1.4",
"type": "build"
}
},

"frameworks": {
"net35": {
"frameworkAssemblies": {
},
"dependencies": {
"JetBrains.Annotations": "10.1.4",
"NetLegacySupport.ConcurrentDictionary": "1.1.0"
}
},
"net40": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"net45": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"net451": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"net452": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"net461": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"dnx451": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"dnx452": {
"dependencies": {
"JetBrains.Annotations": "10.1.4"
},
"frameworkAssemblies": {
"System.Data.Entity": ""
}
},
"dnxcore5": {
"dependencies": {
"JetBrains.Annotations": "10.1.4",

"Microsoft.CSharp": "4.0.1-beta-*",

"System.Collections.Concurrent": "4.0.11-beta-*",

"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",

"System.Runtime.Extensions": "4.0.11-beta-*",
"System.Runtime.InteropServices": "4.0.21-beta-*",
"System.Runtime.Loader": "4.0.0-beta-*",

"System.Runtime.Serialization.Primitives": "4.1.0-beta-*",
"System.Runtime.Serialization.Xml": "4.1.0-beta-*",

"System.Reflection.Primitives": "4.0.1-beta-*",
"System.Reflection.TypeExtensions": "4.1.0-beta-*",
"System.Reflection.Emit": "4.0.1-beta-*",

"System.Linq": "4.0.1-beta-*",
"System.Linq.Expressions": "4.0.11-beta-*",
"System.Linq.Queryable": "4.0.1-beta-*",

"System.Globalization": "4.0.11-beta-*",

"System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Diagnostics.Tools": "4.0.1-beta-*",
"System.Diagnostics.Tracing": "4.0.21-beta-*",

"System.Threading": "4.0.11-beta-*"
"System.Collections.Concurrent": "4.0.11-*",
"System.Dynamic.Runtime": "4.0.11-*",
"System.Reflection.Emit": "4.0.1-*",
"System.Reflection.TypeExtensions": "4.1.0-*",
"System.Linq.Expressions": "4.0.11-*",
"System.Linq.Queryable": "4.0.1-*"
}
},
"dotnet54": {
"dependencies": {
"JetBrains.Annotations": "10.1.4",

"Microsoft.CSharp": "4.0.1-beta-*",

"System.Collections.Concurrent": "4.0.11-beta-*",

"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc1-final",

"System.Runtime.Extensions": "4.0.11-beta-*",
"System.Runtime.InteropServices": "4.0.21-beta-*",
"System.Runtime.Loader": "4.0.0-beta-*",

"System.Runtime.Serialization.Primitives": "4.1.0-beta-*",
"System.Runtime.Serialization.Xml": "4.1.0-beta-*",

"System.Reflection.Primitives": "4.0.1-beta-*",
"System.Reflection.TypeExtensions": "4.1.0-beta-*",
"System.Reflection.Emit": "4.0.1-beta-*",

"System.Linq": "4.0.1-beta-*",
"System.Linq.Expressions": "4.0.11-beta-*",
"System.Linq.Queryable": "4.0.1-beta-*",

"System.Globalization": "4.0.11-beta-*",

"System.Diagnostics.Debug": "4.0.11-beta-*",
"System.Diagnostics.Tools": "4.0.1-beta-*",
"System.Diagnostics.Tracing": "4.0.21-beta-*",

"System.Threading": "4.0.11-beta-*"
"System.Collections.Concurrent": "4.0.11-*",
"System.Dynamic.Runtime": "4.0.11-*",
"System.Reflection.Emit": "4.0.1-*",
"System.Reflection.TypeExtensions": "4.1.0-*",
"System.Linq.Expressions": "4.0.11-*",
"System.Linq.Queryable": "4.0.1-*"
}
},
"sl5": {
"compilationOptions": {
"define": [ "SILVERLIGHT" ]
},
"dependencies": {
"JetBrains.Annotations": "10.1.4",
"Portable.ConcurrentDictionary": "1.0.1"
},
"frameworkAssemblies": {
Expand Down
26 changes: 13 additions & 13 deletions web/DynamicLinqWebDocs/DynamicLinqWebDocs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@
<ItemGroup>
<Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
<HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
<Reference Include="MarkdownSharp">
<HintPath>..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll</HintPath>
<HintPath>..\..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SimpleMvcSitemap, Version=2.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SimpleMvcSitemap.2.3.1\lib\net45\SimpleMvcSitemap.dll</HintPath>
<HintPath>..\..\packages\SimpleMvcSitemap.2.3.1\lib\net45\SimpleMvcSitemap.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -68,34 +68,34 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
Expand All @@ -104,7 +104,7 @@
<Reference Include="System.EnterpriseServices" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
</Reference>
Expand All @@ -113,7 +113,7 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
<HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup />
Expand Down