Browse Source

Apewer-6.5.4

dev
王厅 4 years ago
parent
commit
6a4e1a6752
  1. 48
      Apewer.Source/Apewer.Source.csproj
  2. 22
      Apewer.Source/Externals/MySql.Data-6.9.11/MySqlClient/MysqlDefs.cs
  3. 16
      Apewer.Source/Source/SqlClient.cs
  4. 35
      Apewer.Web/Apewer.Web.csproj
  5. 25
      Apewer.Windows/Apewer.Windows.csproj
  6. 11
      Apewer/Apewer.csproj
  7. 71
      Apewer/_Common.props
  8. 2
      Apewer/_Extensions.cs
  9. 3
      ChangeLog.md

48
Apewer.Source/Apewer.Source.csproj

@ -1,30 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Apewer\_Common.props" />
<Import Project="..\Apewer.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);SOURCE;</DefineConstants>
<OutputType>Library</OutputType>
<DefineConstants>SOURCE;$(DefineConstants);</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">MYSQL_6_10;$(DefineConstants);</DefineConstants>
<DefineConstants Condition="'$(TargetFramework)'=='net40'">MYSQL_6_9;$(DefineConstants);</DefineConstants>
<TargetFrameworks>netstandard2.0;net40;net20</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Apewer.Source</AssemblyName>
<Description></Description>
<PackageId>Apewer.Source</PackageId>
<RootNamespace>Apewer</RootNamespace>
<Title>Apewer.Source</Title>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Apewer\Apewer.csproj" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.110" />
</ItemGroup>
<!-- .NET Standard 2.0 -->
<PropertyGroup>
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);MYSQL_6_10;</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
@ -32,38 +21,9 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
</ItemGroup>
<!-- .NET Framework 4.0 -->
<PropertyGroup>
<DefineConstants Condition="'$(TargetFramework)'=='net40'">$(DefineConstants);MYSQL_6_9;</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<Reference Include="CustomMarshalers" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="PresentationCore" />
<Reference Include="System.Core" />
<Reference Include="System.Configuration" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Security" />
<Reference Include="System.Speech" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup>
<!-- .NET Framework 2.0 -->
<ItemGroup Condition="'$(TargetFramework)'=='net20'">
<Reference Include="CustomMarshalers" />
<Reference Include="System.Configuration" />
<Reference Include="System.Design" />
<Reference Include="System.Management" />
<Reference Include="System.Security" />
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
</Project>

22
Apewer.Source/Externals/MySql.Data-6.9.11/MySqlClient/MysqlDefs.cs

@ -517,17 +517,17 @@ namespace Externals.MySql.Data.MySqlClient
get
{
string os = string.Empty;
try
{
var searcher = new System.Management.ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem");
var collection = searcher.Get();
foreach (var mgtObj in collection)
{
os = mgtObj.GetPropertyValue("Caption").ToString();
break;
}
}
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex.ToString()); }
// try
// {
// var searcher = new System.Management.ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem");
// var collection = searcher.Get();
// foreach (var mgtObj in collection)
// {
// os = mgtObj.GetPropertyValue("Caption").ToString();
// break;
// }
// }
// catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex.ToString()); }
return os;
}

16
Apewer.Source/Source/SqlClient.cs

@ -1,12 +1,10 @@
/* 2021.11.07 */
using Apewer;
using Apewer.Source;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Net;
using System.Text;
using static Apewer.Source.OrmHelper;
@ -219,8 +217,9 @@ namespace Apewer.Source
try
{
using (var command = new SqlCommand())
using (var adapter = new SqlDataAdapter())
{
var command = adapter.SelectCommand;
command.Connection = _db;
command.CommandTimeout = _timeout.Query;
command.CommandText = sql;
@ -233,13 +232,10 @@ namespace Apewer.Source
}
using (var ds = new DataSet())
{
using (var da = new SqlDataAdapter(sql, _db))
{
var name = "table_" + Guid.NewGuid().ToString("n");
da.Fill(ds, name);
var table = ds.Tables[name];
return new Query(table, true);
}
var srcTable = "table_" + Guid.NewGuid().ToString("n");
adapter.Fill(ds, srcTable);
var table = ds.Tables[srcTable];
return new Query(table, true);
}
}
}

35
Apewer.Web/Apewer.Web.csproj

@ -1,19 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Apewer\_Common.props" />
<Import Project="..\Apewer.props" />
<PropertyGroup>
<DefineConstants>$(DefineConstants);WEB;</DefineConstants>
<OutputType>Library</OutputType>
<TargetFrameworks>net40;net20;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Apewer.Web</AssemblyName>
<Description></Description>
<PackageId>Apewer.Web</PackageId>
<RootNamespace>Apewer</RootNamespace>
<Title>Apewer.Web</Title>
<DefineConstants>WEB;$(DefineConstants);</DefineConstants>
<TargetFrameworks>netcoreapp3.1;net40;net20</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
@ -25,22 +16,10 @@
<ItemGroup>
<ProjectReference Include="..\Apewer\Apewer.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net20'">
<Reference Include="System.Web" />
<FrameworkReference Condition="'$(TargetFramework)' == 'netcoreapp3.1'" Include="Microsoft.AspNetCore.App" />
<Reference Condition="'$(TargetFramework)' == 'net461'" Include="System.Web" />
<Reference Condition="'$(TargetFramework)' == 'net40'" Include="System.Web" />
<Reference Condition="'$(TargetFramework)' == 'net20'" Include="System.Web" />
</ItemGroup>
</Project>

25
Apewer.Windows/Apewer.Windows.csproj

@ -1,28 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Apewer\_Common.props" />
<Import Project="..\Apewer.props" />
<PropertyGroup>
<NoWarn>CS0108;CS0612</NoWarn>
<OutputType>Library</OutputType>
<TargetFrameworks>net461;net40;net20;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Apewer.Windows</AssemblyName>
<Description></Description>
<PackageId>Apewer.Windows</PackageId>
<RootNamespace>Apewer</RootNamespace>
<Title>Apewer.Windows</Title>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Apewer\Apewer.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<FrameworkReference Include="Microsoft.WindowsDesktop.App" />
</ItemGroup>
<!-- .NET Core 3.1 -->
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<!-- <UseWPF>true</UseWPF> -->
<!-- <UseWindowsForms>true</UseWindowsForms> -->
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<!-- <FrameworkReference Include="Microsoft.AspNetCore.App" /> -->
<FrameworkReference Include="Microsoft.WindowsDesktop.App" />
</ItemGroup>
<!-- .NET Framework 4.6.1 -->
<ItemGroup Condition="'$(TargetFramework)'=='net461'">

11
Apewer/Apewer.csproj

@ -1,20 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="_Common.props" />
<Import Project="..\Apewer.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.1;netstandard2.0;netcoreapp3.1;net461;net40;net20</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Apewer</AssemblyName>
<Description></Description>
<PackageId>Apewer</PackageId>
<RootNamespace>Apewer</RootNamespace>
<Title>Apewer</Title>
</PropertyGroup>
<!-- .NET Standard 2.1 -->
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
<DefineConstants>NETSTD;HAVE_ASYNC;HAVE_BIG_INTEGER;$(DefineConstants);$(AdditionalConstants)</DefineConstants>

71
Apewer/_Common.props

@ -1,71 +0,0 @@
<Project>
<!-- <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> -->
<!-- 生成 -->
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> -->
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<LangVersion>latest</LangVersion>
<!-- <NoWarn>CS0108,CS0162,CS0414,CS0612,CS0618,CS0649,CS1589,CS1570,CS1572,CS1573,CS3019,CS3021</NoWarn> -->
</PropertyGroup>
<!-- 程序集信息 -->
<PropertyGroup>
<Product>Apewer Libraries</Product>
<Version>6.5.3</Version>
</PropertyGroup>
<!-- NuGet -->
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageOutputPath>..\</PackageOutputPath>
<IsPackable>true</IsPackable>
</PropertyGroup>
<!-- .NET Standard 2.1 -->
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
<AssemblyTitle>$(AssemblyName) - .NET Standard 2.1</AssemblyTitle>
<DefineConstants>NETSTD;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<!-- .NET Standard 2.0 -->
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<AssemblyTitle>$(AssemblyName) - .NET Standard 2.0</AssemblyTitle>
<DefineConstants>NETSTD;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<!-- .NET Framework 2.0 -->
<PropertyGroup Condition="'$(TargetFramework)'=='net20'">
<AssemblyTitle>$(AssemblyName) - .NET Framework 2.0</AssemblyTitle>
<DefineConstants>NETFX;NET20;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<!-- .NET Framework 4.0 -->
<PropertyGroup Condition="'$(TargetFramework)'=='net40'">
<AssemblyTitle>$(AssemblyName) - .NET Framework 4.0</AssemblyTitle>
<DefineConstants>NETFX;NET40;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<!-- .NET Framework 4.6.1 -->
<PropertyGroup Condition="'$(TargetFramework)'=='net461'">
<AssemblyTitle>$(AssemblyName) - .NET Framework 4.6.1</AssemblyTitle>
<DefineConstants>NETFX;NET461;NET45;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<!-- .NET Core 3.1 -->
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<AssemblyTitle>$(AssemblyName) - .NET Core 3.1</AssemblyTitle>
<DefineConstants>NETCORE;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
<!-- <UseWPF>true</UseWPF> -->
<!-- <UseWindowsForms>true</UseWindowsForms> -->
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<!-- <FrameworkReference Include="Microsoft.AspNetCore.App" /> -->
<!-- <FrameworkReference Include="Microsoft.WindowsDesktop.App" /> -->
</ItemGroup>
<!-- <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" /> -->
</Project>

2
Apewer/_Extensions.cs

@ -218,7 +218,7 @@ public static class Extensions_Apewer
public static long Stamp(this DateTime @this, bool byMilliseconds = true) => ClockUtility.Stamp(@this, byMilliseconds);
/// <summary>转换为易于阅读的文本。</summary>
/// <remarks>格式:1970-</remarks>
/// <remarks>格式:1970-01-01 00:00:00.000</remarks>
public static string Lucid(this DateTime @this, bool date = true, bool time = true, bool seconds = true, bool milliseconds = true) => ClockUtility.Lucid(@this, date, time, seconds, milliseconds);
/// <summary>转换为紧凑的文本。</summary>

3
ChangeLog.md

@ -1,6 +1,9 @@

### 最新提交
### 6.5.4
- Source:调整了 SqlClient 的查询超时设置。
### 6.5.3
- Source:修正代码错误。

Loading…
Cancel
Save