项目结构调整

master
rszn 6 months ago
parent fe82b0cdbb
commit 23ec8d5813

@ -8,11 +8,15 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BouncyCastle" Version="1.8.9" /> <PackageReference Include="BouncyCastle" Version="1.8.9" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.34" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" /> <Reference Include="HybirdFrameworkCore">
<HintPath>lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
</Project> </Project>

@ -8,8 +8,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj"/>
<ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj"/>
<ProjectReference Include="..\Entity\Entity.csproj" /> <ProjectReference Include="..\Entity\Entity.csproj" />
<ProjectReference Include="..\Repository\Repository.csproj" /> <ProjectReference Include="..\Repository\Repository.csproj" />
<ProjectReference Include="..\Service\Service.csproj" /> <ProjectReference Include="..\Service\Service.csproj" />
@ -21,6 +19,15 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.115" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.115" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="HybirdFrameworkDriver">
<HintPath>..\Common\lib\HybirdFrameworkDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="log4net.xml"> <Content Update="log4net.xml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>

@ -29,11 +29,16 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" /> <ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Api\Resp\TboxResp.cs" /> <Compile Remove="Api\Resp\TboxResp.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>

@ -12,7 +12,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj"/>
<ProjectReference Include="..\Entity\Entity.csproj" /> <ProjectReference Include="..\Entity\Entity.csproj" />
</ItemGroup> </ItemGroup>
@ -20,4 +19,10 @@
<Compile Remove="Station\AmtOrderInfoRepository.cs" /> <Compile Remove="Station\AmtOrderInfoRepository.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>

@ -1,10 +1,5 @@
using DotNetty.Codecs.Mqtt.Packets; using HybirdFrameworkDriver.ModbusTcpMaster;
using HybirdFrameworkDriver.ModbusTcpMaster;
using HybirdFrameworkDriver.Session; using HybirdFrameworkDriver.Session;
using Newtonsoft.Json.Linq;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using Pipelines.Sockets.Unofficial.Arenas;
using System.Net.NetworkInformation;
using Service.Plc.Msg; using Service.Plc.Msg;
namespace Service.Init.Entity namespace Service.Init.Entity

@ -7,12 +7,16 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="7.1.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="DotNetty.Buffers" Version="0.7.5" /> <PackageReference Include="DotNetty.Buffers" Version="0.7.5" />
<PackageReference Include="DotNetty.Codecs" Version="0.7.5" /> <PackageReference Include="DotNetty.Codecs" Version="0.7.5" />
<PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.7.5" /> <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.7.5" />
<PackageReference Include="DotNetty.Common" Version="0.7.5" /> <PackageReference Include="DotNetty.Common" Version="0.7.5" />
<PackageReference Include="DotNetty.Handlers" Version="0.7.5" /> <PackageReference Include="DotNetty.Handlers" Version="0.7.5" />
<PackageReference Include="DotNetty.Transport" Version="0.7.5" /> <PackageReference Include="DotNetty.Transport" Version="0.7.5" />
<PackageReference Include="HslCommunication" Version="11.1.1" />
<PackageReference Include="log4net" Version="2.0.15" /> <PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" /> <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.115" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.115" />
@ -26,6 +30,7 @@
<PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" /> <PackageReference Include="MQTTnet.AspNetCore" Version="3.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.115" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.115" />
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" /> <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" /> <PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.1" /> <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.1" />
@ -33,10 +38,17 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
<ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
<ProjectReference Include="..\Entity\Entity.csproj" /> <ProjectReference Include="..\Entity\Entity.csproj" />
<ProjectReference Include="..\Repository\Repository.csproj" /> <ProjectReference Include="..\Repository\Repository.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="HybirdFrameworkDriver">
<HintPath>..\Common\lib\HybirdFrameworkDriver.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>

@ -0,0 +1,413 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>HybirdFrameworkCore</name>
</assembly>
<members>
<member name="T:HybirdFrameworkCore.Attribute.ConstAttribute">
<summary>
常量特性
</summary>
</member>
<member name="T:HybirdFrameworkCore.Attribute.NotEmptyAttribute">
<summary>
验证值类型不能0
</summary>
</member>
<member name="M:HybirdFrameworkCore.Autofac.Attribute.PropertyAttribute.#ctor(System.Int32,System.Int32,HybirdFrameworkCore.Autofac.Attribute.PropertyReadConstant,System.Double,System.Int32,System.Double)">
<summary>
</summary>
<param name="start"></param>
<param name="length"></param>
<param name="type"></param>
<param name="scale">缩放</param>
<param name="round">舍入方式,用于处理浮点数的精度问题</param>
<param name="offset">偏移量</param>
</member>
<member name="M:HybirdFrameworkCore.Autofac.Attribute.ScopeAttribute.#ctor(System.String)">
<summary>
向容器注入bean默认单例模式
</summary>
<param name="scope"></param>
</member>
<member name="T:HybirdFrameworkCore.Configuration.AppSettingsConstVars">
<summary>
配置文件格式化
</summary>
</member>
<member name="F:HybirdFrameworkCore.Configuration.AppSettingsConstVars.DbSqlConnection">
<summary>
获取数据库连接字符串
</summary>
</member>
<member name="F:HybirdFrameworkCore.Configuration.AppSettingsConstVars.DbDbType">
<summary>
获取数据库类型
</summary>
</member>
<member name="F:HybirdFrameworkCore.Configuration.AppSettingsConstVars.AutoUpdate">
<summary>
自动更新开关
</summary>
</member>
<member name="F:HybirdFrameworkCore.Configuration.AppSettingsConstVars.Version">
<summary>
版本号
</summary>
</member>
<member name="F:HybirdFrameworkCore.Configuration.AppSettingsConstVars.Url">
<summary>
更新服务器地址
</summary>
</member>
<member name="T:HybirdFrameworkCore.Configuration.AppSettingsHelper">
<summary>
获取Appsettings配置信息
</summary>
</member>
<member name="M:HybirdFrameworkCore.Configuration.AppSettingsHelper.GetContent(System.String[])">
<summary>
封装要操作的字符
AppSettingsHelper.GetContent(new string[] { "JwtConfig", "SecretKey" });
</summary>
<param name="sections">节点配置</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Configuration.AppSettingsHelper.GetBool(System.String[])">
<summary>
</summary>
<param name="sections"></param>
<returns></returns>
</member>
<member name="T:HybirdFrameworkCore.Const.EndingConst">
<summary>
大小端常量c#默认小端 DCBA
</summary>
</member>
<member name="T:HybirdFrameworkCore.Const.EndingConst.ByteSeq">
<summary>
字节序,C# 默认BA
</summary>
</member>
<member name="F:HybirdFrameworkCore.Const.EndingConst.ByteSeq.AB">
<summary>
</summary>
</member>
<member name="F:HybirdFrameworkCore.Const.EndingConst.ByteSeq.BA">
<summary>
</summary>
</member>
<member name="T:HybirdFrameworkCore.Const.EndingConst.WordSeq">
<summary>
字序 c# 默认DC
</summary>
</member>
<member name="F:HybirdFrameworkCore.Const.EndingConst.WordSeq.CD">
<summary>
</summary>
</member>
<member name="F:HybirdFrameworkCore.Const.EndingConst.WordSeq.DC">
<summary>
</summary>
</member>
<member name="T:HybirdFrameworkCore.Entity.DatetimeJsonConverter">
<summary>
序列化
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.PageResult`1.PageNum">
<summary>
当前页标
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.PageResult`1.PageSize">
<summary>
每页大小
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.PageResult`1.Rows">
<summary>
返回数据
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.PageResult`1.ToTal">
<summary>
当前页标
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.QueryPageModel.PageNum">
<summary>
页码
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.QueryPageModel.PageSize">
<summary>
页数
</summary>
</member>
<member name="T:HybirdFrameworkCore.Entity.Result`1">
<summary>
通用返回信息类
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.Result`1.Status">
<summary>
状态码
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.Result`1.IsSuccess">
<summary>
操作是否成功
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.Result`1.Msg">
<summary>
返回信息
</summary>
</member>
<member name="P:HybirdFrameworkCore.Entity.Result`1.Data">
<summary>
返回数据集合
</summary>
</member>
<member name="M:HybirdFrameworkCore.Entity.Result`1.Success(`0)">
<summary>
返回成功
</summary>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Entity.Result`1.Success(`0,System.String)">
<summary>
返回成功
</summary>
<param name="data">数据</param>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Entity.Result`1.Fail(System.String)">
<summary>
返回失败
</summary>
<param name="msg">消息</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Entity.Result`1.Fail(`0,System.String)">
<summary>
返回失败
</summary>
<param name="msg">消息</param>
<param name="data">数据</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Entity.Result`1.Message(System.Boolean,System.String,`0)">
<summary>
返回消息
</summary>
<param name="success">失败/成功</param>
<param name="msg">消息</param>
<param name="data">数据</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Entity.Result`1.Message(System.Boolean,`0)">
<summary>
返回消息
</summary>
<param name="success">失败/成功</param>
<param name="msg">消息</param>
<param name="data">数据</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.#ctor(System.String,System.String,System.Int32)">
<summary>
</summary>
<param name="connectionString">连接字符串</param>
<param name="instanceName">实例名称</param>
<param name="defaultDB">默认数据库</param>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.GetConnect">
<summary>
获取ConnectionMultiplexer
</summary>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.GetDatabase">
<summary>
获取数据库
</summary>
<param name="configName"></param>
<param name="db">默认为0优先代码的db配置其次config中的配置</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.GetDatabase(System.Int32)">
<summary>
获取数据库
</summary>
<param name="configName"></param>
<param name="db">默认为0优先代码的db配置其次config中的配置</param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.GetStrValue(System.String)">
<summary>
获取Redis中的值同步版本
</summary>
<param name="key"></param>
<returns>对应的值如果键不存在则返回null</returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.PublishAsync(System.String,System.String)">
<summary>
先进先出队列
</summary>
<param name="topic"></param>
<param name="value"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.GetAsync(System.String)">
<summary>
获取Redis中的值异步版本
</summary>
<param name="key"></param>
<returns>一个表示异步操作的任务任务的结果是对应的值如果键不存在则返回null</returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.SetKeyValueStr(System.String,System.String,System.Nullable{System.TimeSpan})">
<summary>
设置Redis中的值同步版本
</summary>
<param name="key"></param>
<param name="value"></param>
<param name="expiry"></param>
<returns>操作是否成功</returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.SetAsync(System.String,System.String)">
<summary>
设置Redis中的值异步版本
</summary>
<param name="key"></param>
<param name="value"></param>
<returns>一个表示异步操作的任务</returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.GetStrListValue(System.String)">
<summary>
</summary>
<param name="key"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Redis.RedisHelper.SetListInRedis(System.String,System.Collections.Generic.List{System.String})">
<summary>
设置一个 Redis LIST
</summary>
<param name="key"></param>
<param name="values"></param>
</member>
<member name="M:HybirdFrameworkCore.Utils.BitUtls.Bytes2Value(System.Byte[],System.Type,System.Int32,System.Int32,System.Double,System.Int32,System.Double,System.Boolean)">
<summary>
</summary>
<param name="bytes">原始字节数组</param>
<param name="propertyType">字段类型bool byte等</param>
<param name="start">当前字段第一个bit所处开始位置</param>
<param name="length">bit的数量</param>
<param name="scale">精度</param>
<param name="round">保留几位小数</param>
<param name="offset">位偏移</param>
<param name="unSign">对float和double 默认无符号</param>
<returns></returns>
<exception cref="T:System.ArgumentException"></exception>
</member>
<member name="M:HybirdFrameworkCore.Utils.BitUtls.ReverseByteSeq(System.Byte[])">
<summary>
按字节序反序
</summary>
<param name="bytes"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.BitUtls.ReverseWordSeq(System.Byte[])">
<summary>
按字序反序
</summary>
<param name="bytes"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.BitUtls.ProcessEnding(System.Byte[],HybirdFrameworkCore.Const.EndingConst.ByteSeq,HybirdFrameworkCore.Const.EndingConst.WordSeq)">
<summary>
</summary>
<param name="bytes"></param>
<param name="byteSeq"></param>
<param name="wordSeq"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.BitUtls.BytesToHexStr(System.Byte[])">
<summary>
字节数组转16进制字符串空格分隔
</summary>
<param name="byteDatas"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.BitUtls.Sub(System.Byte[],System.Int32,System.Int32)">
<summary>
00 00 01000000
00000000 01010000
</summary>
<param name="bytes"></param>
<param name="startBit"></param>
<param name="length"></param>
<returns></returns>
</member>
<member name="T:HybirdFrameworkCore.Utils.ObjUtils">
<summary>
</summary>
</member>
<member name="M:HybirdFrameworkCore.Utils.ObjUtils.IsNull(System.Object)">
<summary>
</summary>
<param name="o"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.ObjUtils.IsNotNull(System.Object)">
<summary>
</summary>
<param name="o"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.ObjUtils.IsEmpty``1(System.Collections.Generic.List{``0})">
<summary>
</summary>
<param name="list"></param>
<typeparam name="T"></typeparam>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.ObjUtils.IsNotEmpty``1(System.Collections.Generic.List{``0})">
<summary>
</summary>
<param name="list"></param>
<typeparam name="T"></typeparam>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.ObjUtils.IsNullOrWhiteSpace(System.String)">
<summary>
</summary>
<param name="o"></param>
<returns></returns>
</member>
<member name="M:HybirdFrameworkCore.Utils.ObjUtils.IsNotNullOrWhiteSpace(System.String)">
<summary>
</summary>
<param name="o"></param>
<returns></returns>
</member>
</members>
</doc>

@ -14,16 +14,23 @@
<DocumentationFile>bin\Release\WebStarter.xml</DocumentationFile> <DocumentationFile>bin\Release\WebStarter.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<None Remove="HybirdFrameworkCore.xml" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="7.1.0" /> <PackageReference Include="Autofac" Version="7.1.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" />
<PackageReference Include="System.Text.Json" Version="7.0.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj" />
<ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj" />
<ProjectReference Include="..\Repository\Repository.csproj" /> <ProjectReference Include="..\Repository\Repository.csproj" />
<ProjectReference Include="..\Service\Service.csproj" /> <ProjectReference Include="..\Service\Service.csproj" />
</ItemGroup> </ItemGroup>
@ -38,4 +45,19 @@
<Folder Include="wwwroot\" /> <Folder Include="wwwroot\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="HybirdFrameworkDriver">
<HintPath>..\Common\lib\HybirdFrameworkDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="HybirdFrameworkCore.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</ApplicationDefinition>
</ItemGroup>
</Project> </Project>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets')" /> <Import Project="$(NuGetPackageRoot)system.text.json\7.0.4\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.4\buildTransitive\net6.0\System.Text.Json.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
<Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" /> <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />

@ -15,13 +15,20 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj"/>
<ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj"/>
<ProjectReference Include="..\Entity\Entity.csproj" /> <ProjectReference Include="..\Entity\Entity.csproj" />
<ProjectReference Include="..\Repository\Repository.csproj" /> <ProjectReference Include="..\Repository\Repository.csproj" />
<ProjectReference Include="..\Service\Service.csproj" /> <ProjectReference Include="..\Service\Service.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="HybirdFrameworkDriver">
<HintPath>..\Common\lib\HybirdFrameworkDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="log4net.xml"> <Content Update="log4net.xml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile> <ExcludeFromSingleFile>true</ExcludeFromSingleFile>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\7.0.0\buildTransitive\net6.0\System.Text.Json.targets')" /> <Import Project="$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\6.0.9\buildTransitive\netcoreapp3.1\System.Text.Json.targets')" />
<Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" /> <Import Project="$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepclraw.lib.e_sqlite3\2.1.4\buildTransitive\net6.0\SQLitePCLRaw.lib.e_sqlite3.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" /> <Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.3.4\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />
</ImportGroup> </ImportGroup>

@ -25,11 +25,18 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\HybirdFrameworkCore\HybirdFrameworkCore.csproj"/>
<ProjectReference Include="..\HybirdFrameworkDriver\HybirdFrameworkDriver.csproj"/>
<ProjectReference Include="..\Entity\Entity.csproj" /> <ProjectReference Include="..\Entity\Entity.csproj" />
<ProjectReference Include="..\Repository\Repository.csproj" /> <ProjectReference Include="..\Repository\Repository.csproj" />
<ProjectReference Include="..\Service\Service.csproj" /> <ProjectReference Include="..\Service\Service.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Reference Include="HybirdFrameworkCore">
<HintPath>..\Common\lib\HybirdFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="HybirdFrameworkDriver">
<HintPath>..\Common\lib\HybirdFrameworkDriver.dll</HintPath>
</Reference>
</ItemGroup>
</Project> </Project>

@ -5,8 +5,6 @@ VisualStudioVersion = 17.9.34701.34
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStarter", "WebStarter\WebStarter.csproj", "{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStarter", "WebStarter\WebStarter.csproj", "{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkCore", "HybirdFrameworkCore\HybirdFrameworkCore.csproj", "{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repository", "Repository\Repository.csproj", "{01D2CC15-F1FD-4E22-845A-2D2473662860}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Service", "Service\Service.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Service", "Service\Service.csproj", "{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC}"
@ -15,19 +13,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormStarter", "WinFormSt
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Entity", "Entity\Entity.csproj", "{C2380814-15D4-491D-ADF2-ADC68617C3FA}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkDriver", "HybirdFrameworkDriver\HybirdFrameworkDriver.csproj", "{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleStarter", "ConsoleStarter\ConsoleStarter.csproj", "{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleStarter", "ConsoleStarter\ConsoleStarter.csproj", "{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starter", "Starter", "{E0B949DC-17FE-414D-8898-937A317BB853}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starter", "Starter", "{E0B949DC-17FE-414D-8898-937A317BB853}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfStarter", "WpfStarter\WpfStarter.csproj", "{17044C11-3794-4938-BA80-C061BD871AE0}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfStarter", "WpfStarter\WpfStarter.csproj", "{17044C11-3794-4938-BA80-C061BD871AE0}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{C9515084-B676-4C33-9FE7-E0B860493A4F}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{C9515084-B676-4C33-9FE7-E0B860493A4F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{7FC3F04C-9B90-471B-9D43-2AA723DF44CB}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csproj", "{7FC3F04C-9B90-471B-9D43-2AA723DF44CB}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -39,10 +33,6 @@ Global
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Debug|Any CPU.Build.0 = Debug|Any CPU {61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Release|Any CPU.ActiveCfg = Release|Any CPU {61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Release|Any CPU.Build.0 = Release|Any CPU {61B1609B-97EE-48E4-ADA6-4F1A832B8D33}.Release|Any CPU.Build.0 = Release|Any CPU
{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}.Release|Any CPU.Build.0 = Release|Any CPU
{01D2CC15-F1FD-4E22-845A-2D2473662860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01D2CC15-F1FD-4E22-845A-2D2473662860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01D2CC15-F1FD-4E22-845A-2D2473662860}.Debug|Any CPU.Build.0 = Debug|Any CPU {01D2CC15-F1FD-4E22-845A-2D2473662860}.Debug|Any CPU.Build.0 = Debug|Any CPU
{01D2CC15-F1FD-4E22-845A-2D2473662860}.Release|Any CPU.ActiveCfg = Release|Any CPU {01D2CC15-F1FD-4E22-845A-2D2473662860}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -59,10 +49,6 @@ Global
{C2380814-15D4-491D-ADF2-ADC68617C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2380814-15D4-491D-ADF2-ADC68617C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2380814-15D4-491D-ADF2-ADC68617C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {C2380814-15D4-491D-ADF2-ADC68617C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C2380814-15D4-491D-ADF2-ADC68617C3FA}.Release|Any CPU.Build.0 = Release|Any CPU {C2380814-15D4-491D-ADF2-ADC68617C3FA}.Release|Any CPU.Build.0 = Release|Any CPU
{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6ACFA707-E72E-4BA1-8262-9F2E5B758D46}.Release|Any CPU.Build.0 = Release|Any CPU
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -81,12 +67,10 @@ Global
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {E0B949DC-17FE-414D-8898-937A317BB853} {61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {E0B949DC-17FE-414D-8898-937A317BB853}
{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
{01D2CC15-F1FD-4E22-845A-2D2473662860} = {C9515084-B676-4C33-9FE7-E0B860493A4F} {01D2CC15-F1FD-4E22-845A-2D2473662860} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
{A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {C9515084-B676-4C33-9FE7-E0B860493A4F} {A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
{A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {E0B949DC-17FE-414D-8898-937A317BB853} {A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {E0B949DC-17FE-414D-8898-937A317BB853}
{C2380814-15D4-491D-ADF2-ADC68617C3FA} = {C9515084-B676-4C33-9FE7-E0B860493A4F} {C2380814-15D4-491D-ADF2-ADC68617C3FA} = {C9515084-B676-4C33-9FE7-E0B860493A4F}
{6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {D528B94E-8D0A-4A14-A78F-8240ADF3E7C4}
{8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8} = {E0B949DC-17FE-414D-8898-937A317BB853} {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8} = {E0B949DC-17FE-414D-8898-937A317BB853}
{17044C11-3794-4938-BA80-C061BD871AE0} = {E0B949DC-17FE-414D-8898-937A317BB853} {17044C11-3794-4938-BA80-C061BD871AE0} = {E0B949DC-17FE-414D-8898-937A317BB853}
{7FC3F04C-9B90-471B-9D43-2AA723DF44CB} = {C9515084-B676-4C33-9FE7-E0B860493A4F} {7FC3F04C-9B90-471B-9D43-2AA723DF44CB} = {C9515084-B676-4C33-9FE7-E0B860493A4F}

Loading…
Cancel
Save