v4.19.0

shuxinqin · Dec 19, 2021 · bbec208 · bbec208
1 parent b5c1397
commit bbec208
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 74 deletions.
diff --git a/src/Chloe.Extension/Chloe.Extension.csproj b/src/Chloe.Extension/Chloe.Extension.csproj
@@ -15,7 +15,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/Chloe.MySql/Chloe.MySql.csproj b/src/Chloe.MySql/Chloe.MySql.csproj
@@ -15,7 +15,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/Chloe.Oracle/Chloe.Oracle.csproj b/src/Chloe.Oracle/Chloe.Oracle.csproj
@@ -15,7 +15,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/Chloe.PostgreSQL/Chloe.PostgreSQL.csproj b/src/Chloe.PostgreSQL/Chloe.PostgreSQL.csproj
@@ -15,7 +15,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/Chloe.SQLite/Chloe.SQLite.csproj b/src/Chloe.SQLite/Chloe.SQLite.csproj
@@ -15,7 +15,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/Chloe.SqlServer/Chloe.SqlServer.csproj b/src/Chloe.SqlServer/Chloe.SqlServer.csproj
@@ -15,7 +15,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/Chloe/Chloe.csproj b/src/Chloe/Chloe.csproj
@@ -18,7 +18,7 @@
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	<PropertyGroup>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 

diff --git a/src/ChloeDemo/ChloeDemo.csproj b/src/ChloeDemo/ChloeDemo.csproj
@@ -1,73 +1,73 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <!--<TargetFramework>netcoreapp2.0</TargetFramework>-->
-    <!--<TargetFramework>net45</TargetFramework>-->
-    <TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<!--<TargetFramework>net45</TargetFramework>-->
+		<!--<TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>-->
 
-    <AssemblyName>ChloeDemo</AssemblyName>
-    <OutputType>Exe</OutputType>
-    <PackageId>ChloeDemo</PackageId>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
-    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-  </PropertyGroup>
+		<AssemblyName>ChloeDemo</AssemblyName>
+		<OutputType>Exe</OutputType>
+		<PackageId>ChloeDemo</PackageId>
+		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>netcore</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <DefineConstants>netfx</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
-  </ItemGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+		<DefineConstants>netcore</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+		<DefineConstants>netfx</DefineConstants>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Chloe.Extension\Chloe.Extension.csproj" />
-    <ProjectReference Include="..\Chloe.Oracle\Chloe.Oracle.csproj" />
-    <ProjectReference Include="..\Chloe\Chloe.csproj" />
-    <ProjectReference Include="..\Chloe.MySql\Chloe.MySql.csproj" />
-    <ProjectReference Include="..\Chloe.SQLite\Chloe.SQLite.csproj" />
-    <ProjectReference Include="..\Chloe.SqlServer\Chloe.SqlServer.csproj" />
-    <ProjectReference Include="..\Chloe.PostgreSQL\Chloe.PostgreSQL.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Chloe.Extension\Chloe.Extension.csproj" />
+		<ProjectReference Include="..\Chloe.Oracle\Chloe.Oracle.csproj" />
+		<ProjectReference Include="..\Chloe\Chloe.csproj" />
+		<ProjectReference Include="..\Chloe.MySql\Chloe.MySql.csproj" />
+		<ProjectReference Include="..\Chloe.SQLite\Chloe.SQLite.csproj" />
+		<ProjectReference Include="..\Chloe.SqlServer\Chloe.SqlServer.csproj" />
+		<ProjectReference Include="..\Chloe.PostgreSQL\Chloe.PostgreSQL.csproj" />
+	</ItemGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<PlatformTarget>AnyCPU</PlatformTarget>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp2.0|AnyCPU'">
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-  </PropertyGroup>
+	<PropertyGroup>
+		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+	</PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
-    <PackageReference Include="MySql.Data" Version="8.0.15" />
-    <!--<PackageReference Include="MySqlConnector" Version="0.63.2" />-->
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.12.0-beta2" />
-    <PackageReference Include="Npgsql" Version="4.0.0" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
+		<PackageReference Include="MySql.Data" Version="8.0.15" />
+		<!--<PackageReference Include="MySql.Data" Version="8.0.27" />-->
+		<!--<PackageReference Include="MySqlConnector" Version="0.63.2" />-->
+		<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.12.0-beta2" />
+		<PackageReference Include="Npgsql" Version="4.0.0" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <PackageReference Include="Npgsql" Version="4.0.0" />
-    <Reference Include="MySql.Data">
-      <HintPath>..\lib\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess">
-      <HintPath>..\lib\Oracle.ManagedDataAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\lib\System.Data.SQLite.dll</HintPath>
-    </Reference>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+		<PackageReference Include="Npgsql" Version="4.0.0" />
+		<Reference Include="MySql.Data">
+			<HintPath>..\lib\MySql.Data.dll</HintPath>
+		</Reference>
+		<Reference Include="Oracle.ManagedDataAccess">
+			<HintPath>..\lib\Oracle.ManagedDataAccess.dll</HintPath>
+		</Reference>
+		<Reference Include="System.Data.SQLite">
+			<HintPath>..\lib\System.Data.SQLite.dll</HintPath>
+		</Reference>
 
-    <Content Include="x64\SQLite.Interop.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\SQLite.Interop.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+		<Content Include="x64\SQLite.Interop.dll">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<Content Include="x86\SQLite.Interop.dll">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
 </Project>
diff --git a/src/ChloeDemo/DbFunctions.cs b/src/ChloeDemo/DbFunctions.cs
@@ -18,5 +18,10 @@ public static bool StringLike(this string str, string value)
         {
             return str.Contains(value);
         }
+
+        public static bool GroupConcat<T>(T field)
+        {
+            throw new NotSupportedException("Using in lambda only.");
+        }
     }
 }
diff --git a/src/ChloeDemo/TestEntity.cs b/src/ChloeDemo/TestEntity.cs
@@ -1,15 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Chloe.Annotations;
 
 namespace ChloeDemo
 {
+    [Table("TestEntity")]
     public class TestEntity
     {
-        [Chloe.Annotations.Column(IsPrimaryKey = true)]
-        [Chloe.Annotations.AutoIncrement]
+        [Column(IsPrimaryKey = true)]
+        [AutoIncrement]
         public int Id { get; set; }
         public byte? F_Byte { get; set; }
         public Int16? F_Int16 { get; set; }

diff --git a/更新日志.md b/更新日志.md
@@ -1,3 +1,7 @@
+* **2021-12-19**
+	* 使用 C#10
+	* Chloe.MySql 支持设置 Schema
+	* 版本更新至 v4.19.0
 * **2021-11-27**
 	* 修改 https://github.com/shuxinqin/Chloe/issues/275
 	* 版本更新至 v4.18.0