Skip to content

Commit

Permalink
using C#10
Browse files Browse the repository at this point in the history
  • Loading branch information
shuxinqin committed Dec 19, 2021
1 parent 852f39d commit b5c1397
Show file tree
Hide file tree
Showing 375 changed files with 399 additions and 1,062 deletions.
55 changes: 28 additions & 27 deletions src/Chloe.Extension/Chloe.Extension.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net5.0</TargetFrameworks>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net5.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>

<Version>4.12.0</Version>
<AssemblyVersion>4.12.0.0</AssemblyVersion>
<FileVersion>4.12.0.0</FileVersion>
<Description>A lightweight and high-performance Object/Relational Mapping(ORM) library.</Description>
<PackageId>Chloe.Extension</PackageId>
<Product>Chloe.ORM</Product>
<Authors>Shuxin Qin</Authors>
<Copyright>Copyright 2016-2021.</Copyright>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
</PropertyGroup>
<Version>4.12.0</Version>
<AssemblyVersion>4.12.0.0</AssemblyVersion>
<FileVersion>4.12.0.0</FileVersion>
<Description>A lightweight and high-performance Object/Relational Mapping(ORM) library.</Description>
<PackageId>Chloe.Extension</PackageId>
<Product>Chloe.ORM</Product>
<Authors>Shuxin Qin</Authors>
<Copyright>Copyright 2016-2021.</Copyright>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>netcore</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
<DefineConstants>netcore;net5</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>netfx;net45</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>netcore</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
<DefineConstants>netcore;net5</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>netfx;net45</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Chloe\Chloe.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Chloe\Chloe.csproj" />
</ItemGroup>
</Project>
4 changes: 1 addition & 3 deletions src/Chloe.Extension/DbActionBag.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data;
using System.Linq.Expressions;

namespace Chloe
Expand Down
3 changes: 0 additions & 3 deletions src/Chloe.Extension/DbContextExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
using Chloe.Extension;
using Chloe.Infrastructure;
using Chloe.Threading.Tasks;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Threading.Tasks;
Expand Down
3 changes: 0 additions & 3 deletions src/Chloe.Extension/DbContextExtension_NETCORE.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using Chloe.Infrastructure;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;

namespace Chloe
Expand Down
6 changes: 1 addition & 5 deletions src/Chloe.Extension/FieldsResolver.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
using Chloe.Descriptors;
using Chloe.Extensions;
using Chloe.Infrastructure;
using Chloe.Extensions;
using Chloe.Reflection;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq.Expressions;

Expand Down
3 changes: 3 additions & 0 deletions src/Chloe.Extension/GlobalUsings.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
global using System;
global using System.Linq;
global using System.Collections.Generic;
3 changes: 1 addition & 2 deletions src/Chloe.Extension/MappingExtentions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Linq.Expressions;
using System.Linq.Expressions;

namespace Chloe.Entity
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.Extension/ParameterTwoExpressionReplacer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Chloe.Extensions;
using System;
using System.Linq.Expressions;

namespace Chloe.Extension
Expand Down
3 changes: 0 additions & 3 deletions src/Chloe.Extension/QueryExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
using Chloe.Extension;
using Chloe.Infrastructure;
using Chloe.Reflection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;

Expand Down
8 changes: 1 addition & 7 deletions src/Chloe.Extension/Utils.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using Chloe.Infrastructure;
using Chloe.Reflection;
using System;
using System.Collections.Generic;
using System.Linq;

namespace Chloe.Extension
namespace Chloe.Extension
{
static class Utils
{
Expand Down
55 changes: 28 additions & 27 deletions src/Chloe.MySql/Chloe.MySql.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net5.0</TargetFrameworks>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net5.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>

<Version>4.18.0</Version>
<AssemblyVersion>4.18.0.0</AssemblyVersion>
<FileVersion>4.18.0.0</FileVersion>
<Description>A lightweight and high-performance Object/Relational Mapping(ORM) library.</Description>
<PackageId>Chloe.MySql</PackageId>
<Product>Chloe.ORM</Product>
<Authors>Shuxin Qin</Authors>
<Copyright>Copyright 2016-2021.</Copyright>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
</PropertyGroup>
<Version>4.19.0</Version>
<AssemblyVersion>4.19.0.0</AssemblyVersion>
<FileVersion>4.19.0.0</FileVersion>
<Description>A lightweight and high-performance Object/Relational Mapping(ORM) library.</Description>
<PackageId>Chloe.MySql</PackageId>
<Product>Chloe.ORM</Product>
<Authors>Shuxin Qin</Authors>
<Copyright>Copyright 2016-2021.</Copyright>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>netcore</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
<DefineConstants>netcore;net5</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>netfx;net45</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>netcore</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
<DefineConstants>netcore;net5</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>netfx;net45</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Chloe\Chloe.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Chloe\Chloe.csproj" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions src/Chloe.MySql/DDL/MySqlTableGenerator.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
using Chloe.DDL;
using Chloe.Descriptors;
using Chloe.Reflection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Xml.Linq;

namespace Chloe.MySql.DDL
Expand Down
6 changes: 1 addition & 5 deletions src/Chloe.MySql/DataTypeAttribute.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Chloe.MySql
namespace Chloe.MySql
{
public class DataTypeAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/DatabaseProvider.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Chloe.Infrastructure;
using System;
using System.Data;

namespace Chloe.MySql
Expand Down
4 changes: 1 addition & 3 deletions src/Chloe.MySql/DbParamCollection.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data;

namespace Chloe.MySql
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/EvaluableDbExpressionTransformer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Chloe.Core.Visitors;
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Collections.Generic;
using System.Reflection;

namespace Chloe.MySql
Expand Down
4 changes: 4 additions & 0 deletions src/Chloe.MySql/GlobalUsings.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
global using System;
global using System.Text;
global using System.Linq;
global using System.Collections.Generic;
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Average_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
2 changes: 0 additions & 2 deletions src/Chloe.MySql/MethodHandlers/Compare_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using Chloe.InternalExtensions;
using System;
using System.Collections.Generic;
using System.Reflection;

namespace Chloe.MySql.MethodHandlers
Expand Down
3 changes: 0 additions & 3 deletions src/Chloe.MySql/MethodHandlers/Contains_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using Chloe.InternalExtensions;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;

namespace Chloe.MySql.MethodHandlers
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Else_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Collections.Generic;
using static Chloe.DbExpressions.DbCaseWhenExpression;

namespace Chloe.MySql.MethodHandlers
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/EndsWith_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
2 changes: 0 additions & 2 deletions src/Chloe.MySql/MethodHandlers/In_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System;
using System.Collections.Generic;
using System.Reflection;

namespace Chloe.MySql.MethodHandlers
Expand Down
2 changes: 0 additions & 2 deletions src/Chloe.MySql/MethodHandlers/IsNullOrEmpty_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Collections.Generic;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Max_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
2 changes: 0 additions & 2 deletions src/Chloe.MySql/MethodHandlers/MethodHandlerHelper.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using Chloe.InternalExtensions;
using System;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Min_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Parse_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/StartsWith_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Substring_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Chloe.MySql/MethodHandlers/Sum_Handler.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Chloe.DbExpressions;
using Chloe.RDBMS;
using System.Linq;

namespace Chloe.MySql.MethodHandlers
{
Expand Down
4 changes: 0 additions & 4 deletions src/Chloe.MySql/MySqlContext.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
using Chloe.Infrastructure;
using Chloe.RDBMS;
using Chloe.Threading.Tasks;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;

namespace Chloe.MySql
Expand Down
3 changes: 1 addition & 2 deletions src/Chloe.MySql/MySqlContextExtension.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Linq.Expressions;
using System.Linq.Expressions;

namespace Chloe.MySql
{
Expand Down
3 changes: 0 additions & 3 deletions src/Chloe.MySql/PropertyBuilderExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using Chloe.Entity;
using System;
using System.Collections.Generic;
using System.Text;

namespace Chloe.MySql
{
Expand Down
2 changes: 0 additions & 2 deletions src/Chloe.MySql/SqlGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
using Chloe.InternalExtensions;
using Chloe.RDBMS;
using Chloe.Reflection;
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;

Expand Down
Loading

0 comments on commit b5c1397

Please sign in to comment.