Skip to content

Commit bbec208

Browse files
author
shuxinqin
committed
v4.19.0
1 parent b5c1397 commit bbec208

File tree

11 files changed

+81
-74
lines changed

11 files changed

+81
-74
lines changed

‎src/Chloe.Extension/Chloe.Extension.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<PropertyGroup>
1919
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2020
</PropertyGroup>
2121

‎src/Chloe.MySql/Chloe.MySql.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<PropertyGroup>
1919
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2020
</PropertyGroup>
2121

‎src/Chloe.Oracle/Chloe.Oracle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<PropertyGroup>
1919
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2020
</PropertyGroup>
2121

‎src/Chloe.PostgreSQL/Chloe.PostgreSQL.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<PropertyGroup>
1919
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2020
</PropertyGroup>
2121

‎src/Chloe.SQLite/Chloe.SQLite.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<PropertyGroup>
1919
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2020
</PropertyGroup>
2121

‎src/Chloe.SqlServer/Chloe.SqlServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1616
</PropertyGroup>
1717

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<PropertyGroup>
1919
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2020
</PropertyGroup>
2121

‎src/Chloe/Chloe.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1919
</PropertyGroup>
2020

21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21+
<PropertyGroup>
2222
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2323
</PropertyGroup>
2424

‎src/ChloeDemo/ChloeDemo.csproj

+61-61
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<!--<TargetFramework>netcoreapp2.0</TargetFramework>-->
5-
<!--<TargetFramework>net45</TargetFramework>-->
6-
<TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<!--<TargetFramework>net45</TargetFramework>-->
6+
<!--<TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>-->
77

8-
<AssemblyName>ChloeDemo</AssemblyName>
9-
<OutputType>Exe</OutputType>
10-
<PackageId>ChloeDemo</PackageId>
11-
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
12-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15-
</PropertyGroup>
8+
<AssemblyName>ChloeDemo</AssemblyName>
9+
<OutputType>Exe</OutputType>
10+
<PackageId>ChloeDemo</PackageId>
11+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
12+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
13+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
14+
</PropertyGroup>
1615

17-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
18-
<DefineConstants>netcore</DefineConstants>
19-
</PropertyGroup>
20-
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
21-
<DefineConstants>netfx</DefineConstants>
22-
</PropertyGroup>
23-
<ItemGroup>
24-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
25-
</ItemGroup>
16+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
17+
<DefineConstants>netcore</DefineConstants>
18+
</PropertyGroup>
19+
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
20+
<DefineConstants>netfx</DefineConstants>
21+
</PropertyGroup>
22+
<ItemGroup>
23+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
24+
</ItemGroup>
2625

27-
<ItemGroup>
28-
<ProjectReference Include="..\Chloe.Extension\Chloe.Extension.csproj" />
29-
<ProjectReference Include="..\Chloe.Oracle\Chloe.Oracle.csproj" />
30-
<ProjectReference Include="..\Chloe\Chloe.csproj" />
31-
<ProjectReference Include="..\Chloe.MySql\Chloe.MySql.csproj" />
32-
<ProjectReference Include="..\Chloe.SQLite\Chloe.SQLite.csproj" />
33-
<ProjectReference Include="..\Chloe.SqlServer\Chloe.SqlServer.csproj" />
34-
<ProjectReference Include="..\Chloe.PostgreSQL\Chloe.PostgreSQL.csproj" />
35-
</ItemGroup>
26+
<ItemGroup>
27+
<ProjectReference Include="..\Chloe.Extension\Chloe.Extension.csproj" />
28+
<ProjectReference Include="..\Chloe.Oracle\Chloe.Oracle.csproj" />
29+
<ProjectReference Include="..\Chloe\Chloe.csproj" />
30+
<ProjectReference Include="..\Chloe.MySql\Chloe.MySql.csproj" />
31+
<ProjectReference Include="..\Chloe.SQLite\Chloe.SQLite.csproj" />
32+
<ProjectReference Include="..\Chloe.SqlServer\Chloe.SqlServer.csproj" />
33+
<ProjectReference Include="..\Chloe.PostgreSQL\Chloe.PostgreSQL.csproj" />
34+
</ItemGroup>
3635

37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
38-
<PlatformTarget>AnyCPU</PlatformTarget>
39-
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
37+
<PlatformTarget>AnyCPU</PlatformTarget>
38+
</PropertyGroup>
4039

41-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
42-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
43-
</PropertyGroup>
40+
<PropertyGroup>
41+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
42+
</PropertyGroup>
4443

45-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
46-
<PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
47-
<PackageReference Include="MySql.Data" Version="8.0.15" />
48-
<!--<PackageReference Include="MySqlConnector" Version="0.63.2" />-->
49-
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.12.0-beta2" />
50-
<PackageReference Include="Npgsql" Version="4.0.0" />
51-
</ItemGroup>
44+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
45+
<PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
46+
<PackageReference Include="MySql.Data" Version="8.0.15" />
47+
<!--<PackageReference Include="MySql.Data" Version="8.0.27" />-->
48+
<!--<PackageReference Include="MySqlConnector" Version="0.63.2" />-->
49+
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.12.0-beta2" />
50+
<PackageReference Include="Npgsql" Version="4.0.0" />
51+
</ItemGroup>
5252

53-
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
54-
<PackageReference Include="Npgsql" Version="4.0.0" />
55-
<Reference Include="MySql.Data">
56-
<HintPath>..\lib\MySql.Data.dll</HintPath>
57-
</Reference>
58-
<Reference Include="Oracle.ManagedDataAccess">
59-
<HintPath>..\lib\Oracle.ManagedDataAccess.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System.Data.SQLite">
62-
<HintPath>..\lib\System.Data.SQLite.dll</HintPath>
63-
</Reference>
53+
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
54+
<PackageReference Include="Npgsql" Version="4.0.0" />
55+
<Reference Include="MySql.Data">
56+
<HintPath>..\lib\MySql.Data.dll</HintPath>
57+
</Reference>
58+
<Reference Include="Oracle.ManagedDataAccess">
59+
<HintPath>..\lib\Oracle.ManagedDataAccess.dll</HintPath>
60+
</Reference>
61+
<Reference Include="System.Data.SQLite">
62+
<HintPath>..\lib\System.Data.SQLite.dll</HintPath>
63+
</Reference>
6464

65-
<Content Include="x64\SQLite.Interop.dll">
66-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
67-
</Content>
68-
<Content Include="x86\SQLite.Interop.dll">
69-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
70-
</Content>
71-
</ItemGroup>
65+
<Content Include="x64\SQLite.Interop.dll">
66+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
67+
</Content>
68+
<Content Include="x86\SQLite.Interop.dll">
69+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
70+
</Content>
71+
</ItemGroup>
7272

7373
</Project>

‎src/ChloeDemo/DbFunctions.cs

+5
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@ public static bool StringLike(this string str, string value)
1818
{
1919
return str.Contains(value);
2020
}
21+
22+
public static bool GroupConcat<T>(T field)
23+
{
24+
throw new NotSupportedException("Using in lambda only.");
25+
}
2126
}
2227
}

‎src/ChloeDemo/TestEntity.cs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
2+
using Chloe.Annotations;
63

74
namespace ChloeDemo
85
{
6+
[Table("TestEntity")]
97
public class TestEntity
108
{
11-
[Chloe.Annotations.Column(IsPrimaryKey = true)]
12-
[Chloe.Annotations.AutoIncrement]
9+
[Column(IsPrimaryKey = true)]
10+
[AutoIncrement]
1311
public int Id { get; set; }
1412
public byte? F_Byte { get; set; }
1513
public Int16? F_Int16 { get; set; }

‎更新日志.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* **2021-12-19**
2+
* 使用 C#10
3+
* Chloe.MySql 支持设置 Schema
4+
* 版本更新至 v4.19.0
15
* **2021-11-27**
26
* 修改 https://github.com/shuxinqin/Chloe/issues/275
37
* 版本更新至 v4.18.0

0 commit comments

Comments
 (0)