diff --git a/HybirdFrameworkCore/Attribute/ConstAttribute.cs b/HybirdFrameworkCore/Attribute/ConstAttribute.cs new file mode 100644 index 0000000..8440e08 --- /dev/null +++ b/HybirdFrameworkCore/Attribute/ConstAttribute.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HybirdFrameworkCore.Attribute +{ + /// + /// 常量特性 + /// + //[SuppressSniffer] + [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = true)] + public class ConstAttribute : System.Attribute + { + public string Name { get; set; } + + public ConstAttribute(string name) + { + Name = name; + } + } +} diff --git a/HybirdFrameworkCore/Attribute/NotEmptyAttribute.cs b/HybirdFrameworkCore/Attribute/NotEmptyAttribute.cs new file mode 100644 index 0000000..108e6e4 --- /dev/null +++ b/HybirdFrameworkCore/Attribute/NotEmptyAttribute.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HybirdFrameworkCore.Attribute +{ + /// + /// 验证值类型不能0 + /// + public class NotEmptyAttribute : ValidationAttribute + { + public override bool IsValid(object value) + { + if (value is long id) + { + return id != 0; + } + return false; + } + } +} diff --git a/HybirdFrameworkCore/Autofac/Attribute/PropertyAttribute.cs b/HybirdFrameworkCore/Autofac/Attribute/PropertyAttribute.cs index d1a6ab4..bca041d 100644 --- a/HybirdFrameworkCore/Autofac/Attribute/PropertyAttribute.cs +++ b/HybirdFrameworkCore/Autofac/Attribute/PropertyAttribute.cs @@ -8,7 +8,15 @@ public class PropertyAttribute : System.Attribute public readonly double Scale; public readonly int Start; public readonly PropertyReadConstant Type; - + /// + /// + /// + /// + /// + /// + /// 缩放 + /// 舍入方式，用于处理浮点数的精度问题 + /// 偏移量 public PropertyAttribute(int start, int length, PropertyReadConstant type = PropertyReadConstant.Bit, double scale = 1, int round = 0, double offset = 0) { diff --git a/HybirdFrameworkCore/Autofac/Attribute/ScopeAttribute.cs b/HybirdFrameworkCore/Autofac/Attribute/ScopeAttribute.cs index 5e34d5a..2651c76 100644 --- a/HybirdFrameworkCore/Autofac/Attribute/ScopeAttribute.cs +++ b/HybirdFrameworkCore/Autofac/Attribute/ScopeAttribute.cs @@ -4,7 +4,11 @@ public class ScopeAttribute : System.Attribute { public readonly string Scope; - public ScopeAttribute(string scope) + /// + /// 向容器注入bean，默认单例模式 + /// + /// + public ScopeAttribute(string scope = "SingleInstance") { Scope = scope; } diff --git a/HybirdFrameworkCore/Autofac/AutofacModuleRegister.cs b/HybirdFrameworkCore/Autofac/AutofacModuleRegister.cs index 9510427..b47c643 100644 --- a/HybirdFrameworkCore/Autofac/AutofacModuleRegister.cs +++ b/HybirdFrameworkCore/Autofac/AutofacModuleRegister.cs @@ -50,17 +50,14 @@ public class AutofacModuleRegister : Module { if (ScopeConst.InstancePerLifetimeScope == scope.Scope) { - Log.Debug($"register InstancePerLifetimeScope {type}"); instancePerLifetimeScopeList.Add(type); } else if (ScopeConst.InstancePerDependency == scope.Scope) { - Log.Debug($"register InstancePerDependency {type}"); instancePerDependencyList.Add(type); } else { - Log.Debug($"register SingleInstance {type}"); defaultList.Add(type); } } diff --git a/HybirdFrameworkCore/Const/EndingConst.cs b/HybirdFrameworkCore/Const/EndingConst.cs new file mode 100644 index 0000000..fa0b8bb --- /dev/null +++ b/HybirdFrameworkCore/Const/EndingConst.cs @@ -0,0 +1,39 @@ +namespace HybirdFrameworkCore.Const; + +/// +/// 大小端常量，c#默认小端 DCBA +/// +public class EndingConst +{ + /// + /// 字节序,C# 默认BA + /// + public enum ByteSeq + { + /// + /// + /// + AB, + + /// + /// + /// + BA + } + + /// + /// 字序 c# 默认DC + /// + public enum WordSeq + { + /// + /// + /// + CD, + + /// + /// + /// + DC + } +} \ No newline at end of file diff --git a/HybirdFrameworkCore/Entity/Result.cs b/HybirdFrameworkCore/Entity/Result.cs index 7865213..3cd3831 100644 --- a/HybirdFrameworkCore/Entity/Result.cs +++ b/HybirdFrameworkCore/Entity/Result.cs @@ -8,6 +8,7 @@ /// /// 状态码 /// + public int Status { get; set; } = 200; /// /// 操作是否成功 @@ -53,7 +54,7 @@ /// /// 消息 /// - public static Result Fail(string msg = "失败") + public static Result Fail(string? msg = "失败") { return Message(false, msg, default); } diff --git a/HybirdFrameworkCore/Redis/RedisHelper.cs b/HybirdFrameworkCore/Redis/RedisHelper.cs index d932523..45d9455 100644 --- a/HybirdFrameworkCore/Redis/RedisHelper.cs +++ b/HybirdFrameworkCore/Redis/RedisHelper.cs @@ -83,18 +83,31 @@ public class RedisHelper : IDisposable /// /// 键 /// 对应的值，如果键不存在则返回null - public string GetStrValue(string key) + public string? GetStrValue(string key) { var db = GetConnect().GetDatabase(_defaultDB); return db.StringGet(key); } + /// + /// 先进先出队列 + /// + /// + /// + /// + public void PublishAsync(string topic, string value) + { + ISubscriber sub = GetConnect().GetSubscriber(); + sub.PublishAsync(topic, value); + } + + /// /// 获取Redis中的值（异步版本） /// /// 键 /// 一个表示异步操作的任务，任务的结果是对应的值，如果键不存在则返回null - public async Task GetAsync(string key) + public async Task GetAsync(string key) { var db = GetConnect().GetDatabase(_defaultDB); return await db.StringGetAsync(key); @@ -105,11 +118,12 @@ public class RedisHelper : IDisposable /// /// 键 /// 值 + /// 值 /// 操作是否成功 - public bool SetKeyValueStr(string key, string value) + public bool SetKeyValueStr(string key, string value, TimeSpan? expiry = default(TimeSpan?)) { var db = GetConnect().GetDatabase(_defaultDB); - return db.StringSet(key, value); + return db.StringSet(key, value, expiry); } /// @@ -123,4 +137,40 @@ public class RedisHelper : IDisposable var db = GetConnect().GetDatabase(_defaultDB); return await db.StringSetAsync(key, value); } + + + + /// + /// + /// + /// + /// + public List GetStrListValue(string key) + { + var db = GetConnect().GetDatabase(_defaultDB); + RedisValue[] redisValues = db.ListRange(key); + // 将RedisValue数组转换为string的List + return redisValues.Select(value => (string)value).ToList(); + } + /// + /// 设置一个 Redis LIST + /// + /// + /// + public void SetListInRedis(string key, List values) + { + var db = GetConnect().GetDatabase(_defaultDB); + // 清空已存在的key（如果需要的话） + db.KeyDelete(key); // 注意：这将会删除key及其关联的所有数据 + // 将List中的每个元素推送到Redis LIST的右边 + values.ForEach(value => db.ListRightPush(key, value)); + } + + + public bool Remove(string key) + { + var db = GetConnect().GetDatabase(_defaultDB); + return db.KeyDelete(key); + } + } \ No newline at end of file diff --git a/HybirdFrameworkCore/Utils/BitUtls.cs b/HybirdFrameworkCore/Utils/BitUtls.cs index fcc87b8..2cd9048 100644 --- a/HybirdFrameworkCore/Utils/BitUtls.cs +++ b/HybirdFrameworkCore/Utils/BitUtls.cs @@ -1,4 +1,5 @@ using System.Text; +using HybirdFrameworkCore.Const; namespace HybirdFrameworkCore.Utils; @@ -129,6 +130,65 @@ public static class BitUtls #endregion #region Func + + + /// + /// 按字节序反序 + /// + /// + /// + public static byte[] ReverseByteSeq(byte[] bytes) + { + byte[] result = new byte [bytes.Length]; + for (int i = 0, count = bytes.Length - 1; i < count; i += 2) + { + result[i] = bytes[i + 1]; + result[i + 1] = bytes[i]; + } + + return result; + } + + /// + /// 按字序反序 + /// + /// + /// + public static byte[] ReverseWordSeq(byte[] bytes) + { + byte[] result = new byte [bytes.Length]; + for (int i = 0, count = bytes.Length - 3; i < count; i += 4) + { + result[i] = bytes[i + 2]; + result[i + 1] = bytes[i+3]; + result[i + 2] = bytes[i]; + result[i + 3] = bytes[i+1]; + } + + return result; + } + + /// + /// + /// + /// + /// + /// + /// + public static byte[] ProcessEnding(byte[] bytes, EndingConst.ByteSeq byteSeq, EndingConst.WordSeq wordSeq) + { + if (byteSeq == EndingConst.ByteSeq.BA) + { + bytes = ReverseByteSeq(bytes); + } + + if (wordSeq == EndingConst.WordSeq.DC) + { + bytes = ReverseWordSeq(bytes); + } + + return bytes; + } public static string Bytes2BinaryString(byte[] bytes) { diff --git a/HybirdFrameworkCore/Utils/IEnum.cs b/HybirdFrameworkCore/Utils/IEnum.cs new file mode 100644 index 0000000..cb11b55 --- /dev/null +++ b/HybirdFrameworkCore/Utils/IEnum.cs @@ -0,0 +1,9 @@ +namespace HybirdFrameworkCore.Utils; + +public interface IEnum +{ + public TK Key { get; set; } + public TV Value { get; set; } + + public TV GetByKey(TK key); +} \ No newline at end of file diff --git a/HybirdFrameworkCore/Winform/ModelBindControlAttribute.cs b/HybirdFrameworkCore/Winform/ModelBindControlAttribute.cs index d9800a9..3712c12 100644 --- a/HybirdFrameworkCore/Winform/ModelBindControlAttribute.cs +++ b/HybirdFrameworkCore/Winform/ModelBindControlAttribute.cs @@ -1,7 +1,7 @@ namespace HybirdFrameworkCore.Winform; [AttributeUsage(AttributeTargets.Property)] -public class ModelBindControlAttribute : Attribute +public class ModelBindControlAttribute : System.Attribute { private readonly string ModelName; @@ -17,7 +17,7 @@ public class ModelBindControlAttribute : Attribute } [AttributeUsage(AttributeTargets.Property)] -public class NoEditAttribute : Attribute +public class NoEditAttribute : System.Attribute { private readonly string ModelName; diff --git a/HybirdFrameworkDriver/ModbusTcpMaster/ModbusDecoder.cs b/HybirdFrameworkDriver/ModbusTcpMaster/ModbusDecoder.cs index 08521d0..b8c2345 100644 --- a/HybirdFrameworkDriver/ModbusTcpMaster/ModbusDecoder.cs +++ b/HybirdFrameworkDriver/ModbusTcpMaster/ModbusDecoder.cs @@ -1,20 +1,24 @@ -using HslCommunication.Core; +using HybirdFrameworkCore.Const; using HybirdFrameworkCore.Utils; using log4net; namespace HybirdFrameworkDriver.ModbusTcpMaster; +/// +/// +/// public static class ModbusDecoder { private static readonly ILog Log = LogManager.GetLogger(typeof(ModbusDecoder)); + public static T Decode(byte[] bytes) where T : class, new() { T t = new T(); return Decode(bytes, t); } - public static T Decode(byte[] bytes, T t) where T : class, new() + public static T Decode(byte[] bytes, T t, EndingConst.ByteSeq byteSeq = EndingConst.ByteSeq.AB, EndingConst.WordSeq wordSeq = EndingConst.WordSeq.CD) where T : class, new() { var fields = t.GetType().GetProperties() .Where(it => it.PropertyType.GetGenericTypeDefinition() == typeof(ModbusProperty<>)) @@ -29,19 +33,15 @@ public static class ModbusDecoder } var decodeUseBytes = new byte[bytes.Length]; - switch (ModbusTcpMaster.DataFormat) - { - case DataFormat.ABCD: - for (var i = 0; i < bytes.Length; i++) - if (i % 2 == 0) - decodeUseBytes[i + 1] = bytes[i]; - else - decodeUseBytes[i - 1] = bytes[i]; - break; - case DataFormat.BADC: - decodeUseBytes = bytes; - break; + if (byteSeq == EndingConst.ByteSeq.AB) + { + decodeUseBytes = BitUtls.ReverseByteSeq(bytes); + } + + if (wordSeq == EndingConst.WordSeq.CD) + { + decodeUseBytes = BitUtls.ReverseWordSeq(decodeUseBytes); } foreach (var field in fields) @@ -112,7 +112,8 @@ public static class ModbusDecoder return t; } - private static void SetPropertyValue(int startRegisterNo, ModbusProperty field, byte[] bytes, bool unSign = true) + private static void SetPropertyValue(int startRegisterNo, ModbusProperty field, byte[] bytes, + bool unSign = true) { var registerNo = field.RegisterNo; var start = field.Start; diff --git a/HybirdFrameworkDriver/ModbusTcpMaster/ModbusProperty.cs b/HybirdFrameworkDriver/ModbusTcpMaster/ModbusProperty.cs index 3cdc04f..c534cde 100644 --- a/HybirdFrameworkDriver/ModbusTcpMaster/ModbusProperty.cs +++ b/HybirdFrameworkDriver/ModbusTcpMaster/ModbusProperty.cs @@ -1,12 +1,16 @@ namespace HybirdFrameworkDriver.ModbusTcpMaster; +/// +/// +/// +/// public class ModbusProperty : IModbusProperty { /// /// /// 寄存器编号 /// 根据类型：Register为第几个寄存器 - /// 根据类型：Register 为 几个寄存器 + /// 根据类型：Register 为 几个寄存器(2byte) /// Register/Bit /// 精度 /// 保留几位小数 diff --git a/HybirdFrameworkDriver/ModbusTcpMaster/ModbusTcpMaster.cs b/HybirdFrameworkDriver/ModbusTcpMaster/ModbusTcpMaster.cs index 2787bca..498c201 100644 --- a/HybirdFrameworkDriver/ModbusTcpMaster/ModbusTcpMaster.cs +++ b/HybirdFrameworkDriver/ModbusTcpMaster/ModbusTcpMaster.cs @@ -1,6 +1,6 @@ using HslCommunication; -using HslCommunication.Core; using HslCommunication.ModBus; +using HybirdFrameworkCore.Const; using HybirdFrameworkCore.Utils; using log4net; @@ -18,7 +18,15 @@ public class ModbusTcpMaster public int Port { get; set; } = 502; - public static DataFormat DataFormat { get; set; } = DataFormat.ABCD; + /// + /// 字节序 + /// + public EndingConst.ByteSeq ByteSeq { get; set; } = EndingConst.ByteSeq.AB; + + /// + /// 字序 + /// + public EndingConst.WordSeq WordSeq { get; set; } = EndingConst.WordSeq.CD; public int Duration { get; set; } = 1000; public bool Connected { get; set; } @@ -48,7 +56,6 @@ public class ModbusTcpMaster if (ModbusTcpNet == null) { ModbusTcpNet = new ModbusTcpNet(Ip, Port); - ModbusTcpNet.DataFormat = DataFormat; var result = ModbusTcpNet.ConnectServer(); connectId = ModbusTcpNet.ConnectionId; if (result.IsSuccess) @@ -114,6 +121,11 @@ public class ModbusTcpMaster GetLog().Info("stop listen"); } + public void Reset() + { + ReadAction(this); + } + public byte[]? ReadRegister(int registerNo, int start, int length) { start = start % 16 == 0 ? start / 16 : start / 16 + 1; @@ -184,6 +196,23 @@ public class ModbusTcpMaster return ModbusTcpNet.ReadDiscrete(address, length); } + /// + /// 将数据写入到Modbus的寄存器上去，需要指定起始地址和数据内容，如果富文本地址不指定，默认使用的功能码是 0x10
+ /// To write data to Modbus registers, you need to specify the start address and data content. If the rich text address is not specified, the default function code is 0x10 + /// + /// 起始地址，比如"100"，"x=4;100"，"s=1;100","s=1;x=4;100" + /// 写入的数据，长度根据data的长度来指示 + /// 返回写入结果 + /// 富地址格式，支持携带站号信息，功能码信息，具体参照类的示例代码 + /// + /// 此处演示批量写入的示例 + /// + /// + public OperateResult Write(string address, byte[] value) + { + return ModbusTcpNet.Write(address, value); + } + public bool WriteValue(ModbusProperty property) { @@ -213,14 +242,13 @@ public class ModbusTcpMaster OperateResult readResultRegister = ModbusTcpNet.Read("x=3;" + registerNo, 1); if (readResultRegister.IsSuccess) { - switch (DataFormat) + if (ByteSeq == EndingConst.ByteSeq.AB) { - case DataFormat.ABCD: readResultRegister.Content[1] = setValue[0]; - break; - case DataFormat.BADC: + } + else + { readResultRegister.Content[0] = setValue[0]; - break; } operateResult = ModbusTcpNet.Write("x=16;" + registerNo, readResultRegister.Content); @@ -230,22 +258,7 @@ public class ModbusTcpMaster //其他类型 String 占用几个寄存器 直接补0 else { - var preWriteCont = new byte[length * 2]; - - switch (DataFormat) - { - case DataFormat.ABCD: - for (var i = 0; i < setValue.Length; i++) - if (i % 2 == 0) - preWriteCont[i + 1] = setValue[i]; - else - preWriteCont[i - 1] = setValue[i]; - - break; - case DataFormat.BADC: - Array.Copy(setValue, preWriteCont, setValue.Length); - break; - } + var preWriteCont = BitUtls.ProcessEnding(setValue, ByteSeq, WordSeq); operateResult = ModbusTcpNet.Write("x=16;" + registerNo, preWriteCont); result = operateResult.IsSuccess; @@ -253,23 +266,7 @@ public class ModbusTcpMaster } else if (setValue.Length == length * 2) { - var preWriteCont = new byte[setValue.Length]; - - switch (DataFormat) - { - case DataFormat.ABCD: - for (var i = 0; i < setValue.Length; i++) - if (i % 2 == 0) - preWriteCont[i + 1] = setValue[i]; - else - preWriteCont[i - 1] = setValue[i]; - - break; - case DataFormat.BADC: - //Array.Copy(setValue, preWriteCont, setValue.Length); - break; - } - + var preWriteCont = BitUtls.ProcessEnding(setValue, ByteSeq, WordSeq); operateResult = ModbusTcpNet.Write("x=16;" + registerNo, preWriteCont); result = operateResult.IsSuccess; } diff --git a/Repository/BaseRepository.cs b/Repository/BaseRepository.cs index dfa0cda..770092e 100644 --- a/Repository/BaseRepository.cs +++ b/Repository/BaseRepository.cs @@ -6,8 +6,6 @@ namespace Repository; public abstract class BaseRepository where T : class, new() { - private readonly ISqlSugarClient DbBaseClient; - //private readonly IUnitOfWork _unitOfWork; protected BaseRepository(ISqlSugarClient sqlSugar) { @@ -15,6 +13,8 @@ public abstract class BaseRepository where T : class, new() DbBaseClient = sqlSugar; } + public ISqlSugarClient DbBaseClient; + /// /// 根据主值查询单条数据 /// @@ -32,7 +32,7 @@ public abstract class BaseRepository where T : class, new() /// /// 根据主值查询单条数据 /// - /// id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件 + /// Id（必须指定主键特性 [SugarColumn(IsPrimaryKey=true)]），如果是联合主键，请使用Where条件 /// 是否使用WITH(NOLOCK) /// 数据实体 public async Task QueryByIdAsync(object objId, bool blUseNoLock = false) @@ -88,98 +88,98 @@ public abstract class BaseRepository where T : class, new() .WithNoLockOrNot(blUseNoLock) .ToList(); } - - - /// - /// 根据条件查询表单数据(分页) - /// - /// 页数 - /// 每页几条数据 - /// 是否使用WITH(NOLOCK) - /// - public IPage QueryIPageByCause(QueryPageModel page, Expression> predicate) + + /// + /// 根据条件查询表单数据(分页) + /// + /// 页数 + /// 每页几条数据 + /// 是否使用WITH(NOLOCK) + /// + public IPage QueryIPageByCause(QueryPageModel page, Expression> predicate) + { + if (null == predicate) { - if (null == predicate) { - return this.QueryIPage(page); - } - int totalCount = 0; + return this.QueryIPage(page); + } + int totalCount = 0; - List pageList = DbBaseClient - .Queryable() - .Where(predicate) - .WithNoLockOrNot(false) - .ToPageList(page.Page, page.PageSize, ref totalCount); - + List pageList = DbBaseClient + .Queryable() + .Where(predicate) + .WithNoLockOrNot(false) + .ToPageList(page.Page, page.PageSize, ref totalCount); - return new IPage(totalCount, page, pageList); - } - /// - /// 根据条件查询表单数据(分页) 异步 - /// - /// - /// - /// - public async Task> QueryIPageByCauseAsync(QueryPageModel page, Expression> predicate) - { - if (null == predicate) - { - return await this.QueryIPageAsync(page); - } - RefAsync totalCount = 0; + return new IPage(totalCount, page, pageList); + } + /// + /// 根据条件查询表单数据(分页) 异步 + /// + /// + /// + /// + public async Task> QueryIPageByCauseAsync(QueryPageModel page, Expression> predicate) + { + if (null == predicate) + { + return await this.QueryIPageAsync(page); + } + RefAsync totalCount = 0; - List pageList = await DbBaseClient - .Queryable() - .Where(predicate) - .WithNoLockOrNot(false) - .ToPageListAsync(page.Page, page.PageSize, totalCount); + List pageList = await DbBaseClient + .Queryable() + .Where(predicate) + .WithNoLockOrNot(false) + .ToPageListAsync(page.Page, page.PageSize, totalCount); - return new IPage(totalCount, page, pageList); - } - - - /// - /// 查询表单所有数据(分页) - /// - /// 页数 - /// 每页几条数据 - /// 是否使用WITH(NOLOCK) - /// - public IPage QueryIPage(QueryPageModel page) - { - int totalCount = 0; - //page.Page = page.Page == 0 ? 1 : page.Page;//默认第一页 10条数据 - //page.PageSize = page.PageSize == 0 ? 10 : page.PageSize; - List pageList = DbBaseClient - .Queryable() - .WithNoLockOrNot(false) - .ToPageList(page.Page, page.PageSize, ref totalCount); + return new IPage(totalCount, page, pageList); + } - return new IPage(totalCount, page, pageList); - } - /// - /// 查询表单所有数据(分页) 异步 - /// - /// - /// - public async Task> QueryIPageAsync(QueryPageModel page) - { - RefAsync totalCount = 0; + /// + /// 查询表单所有数据(分页) + /// + /// 页数 + /// 每页几条数据 + /// 是否使用WITH(NOLOCK) + /// + public IPage QueryIPage(QueryPageModel page) + { + int totalCount = 0; + //page.Page = page.Page == 0 ? 1 : page.Page;//默认第一页 10条数据 + //page.PageSize = page.PageSize == 0 ? 10 : page.PageSize; - List pageList = await DbBaseClient + List pageList = DbBaseClient .Queryable() .WithNoLockOrNot(false) - .ToPageListAsync(page.Page, page.PageSize, totalCount); + .ToPageList(page.Page, page.PageSize, ref totalCount); - return new IPage(totalCount, page, pageList); - } + return new IPage(totalCount, page, pageList); + } + + /// + /// 查询表单所有数据(分页) 异步 + /// + /// + /// + public async Task> QueryIPageAsync(QueryPageModel page) + { + RefAsync totalCount = 0; + + List pageList = await DbBaseClient + .Queryable() + .WithNoLockOrNot(false) + .ToPageListAsync(page.Page, page.PageSize, totalCount); + + return new IPage(totalCount, page, pageList); + } /// /// 根据主值列表查询单条数据 @@ -239,6 +239,7 @@ public abstract class BaseRepository where T : class, new() .ToList(); } + /// /// 根据条件查询数据 /// @@ -256,6 +257,66 @@ public abstract class BaseRepository where T : class, new() .WithNoLockOrNot(blUseNoLock) .ToListAsync(); } + public async Task> QueryListByClauseAsync( + bool isWhere, Expression> expression, + Expression> orderBy, + bool blUseNoLock = false) + { + return await DbBaseClient + .Queryable() + .OrderBy(orderBy, OrderByType.Asc) + .WhereIF(isWhere, expression) + .WithNoLockOrNot(blUseNoLock) + .Select() + .ToListAsync(); + } + + public async Task> QueryListByClauseAsync( + Expression> expression, Expression> expression1 + ) + { + return await DbBaseClient + .Queryable() + .Where(expression) + .ToListAsync(expression1); + } + + public async Task> QueryListBySelectClauseAsync(Expression> selectExpression) + { + return await DbBaseClient + .Queryable() + .Select(selectExpression) + .ToListAsync(); + } + + public async Task> QueryListByOrderClauseAsync(Expression> expression) + { + return await DbBaseClient + .Queryable() + .OrderBy(expression, OrderByType.Asc) + .ToListAsync(); + } + public async Task> QueryListByClauseAsync( + Expression>> include1, + Expression> expression) + { + return await DbBaseClient + .Queryable() + .Includes(include1) + .OrderBy(expression, OrderByType.Asc) + .ToListAsync(); + } + public async Task> QueryListByInludeClauseAsync( + Expression> include1, Expression> expression, Expression> expression2 + ) + { + return await DbBaseClient + .Queryable() + .Includes(include1) + .Where(expression) + .OrderBy(expression2, OrderByType.Asc) + .ToListAsync(); + } /// /// 根据条件查询数据 @@ -292,6 +353,89 @@ public abstract class BaseRepository where T : class, new() .WithNoLockOrNot(blUseNoLock) .ToListAsync(); } + public async Task> QueryListByClauseAsync( + bool isWhere, Expression> expression, + bool isWhere1, Expression> expression1, + bool isWhere2, Expression> expression2, + Expression> expression3, + bool blUseNoLock = false) + { + return await DbBaseClient + .Queryable() + .OrderBy(expression3, OrderByType.Asc) + .WhereIF(isWhere, expression) + .WhereIF(isWhere1, expression1) + .WhereIF(isWhere2, expression2) + .WithNoLockOrNot(blUseNoLock) + .ToListAsync(); + } + public async Task> QueryListByClauseAsync( + Expression> expression, + bool isWhere1, Expression> expression1, + bool isWhere2, Expression> expression2, + Expression> expression3, + int pageNumber, int pageSize, RefAsync totalNumber, + bool blUseNoLock = false) + { + return await DbBaseClient + .Queryable() + .OrderBy(expression3, OrderByType.Asc) + .Where(expression) + .WhereIF(isWhere1, expression1) + .WhereIF(isWhere2, expression2) + .WithNoLockOrNot(blUseNoLock) + .ToPageListAsync(pageNumber, pageSize, totalNumber); + } + public async Task> QueryTreeByClauseAsync( + Expression> expression, + Expression>> childListExpression, Expression> parentIdExpression, object rootValue) + { + return await DbBaseClient + .Queryable() + .OrderBy(expression, OrderByType.Asc) + .ToTreeAsync(childListExpression, parentIdExpression, rootValue); + } + public async Task> QueryTreeByClauseAsync( + Expression> expression, + Expression>> childListExpression, Expression> parentIdExpression, object rootValue, object[] childIds) + { + return await DbBaseClient + .Queryable() + .OrderBy(expression, OrderByType.Asc) + .ToTreeAsync(childListExpression, parentIdExpression, rootValue, childIds); + } + public async Task> QueryTreeByClauseAsync( + Expression> parentIdExpression, object primaryKeyValue, bool isContainOneself = true) + { + return await DbBaseClient + .Queryable() + .ToChildListAsync(parentIdExpression, primaryKeyValue, isContainOneself); + } + public async Task> QueryTreeByClauseAsync( + Expression> expression, + Expression> expression1, + Expression>> childListExpression, Expression> parentIdExpression, object rootValue + ) + { + return await DbBaseClient + .Queryable() + .Where(expression) + .OrderBy(expression1, OrderByType.Asc) + .ToTreeAsync(childListExpression, parentIdExpression, rootValue); + } + public async Task> QueryTreeByClauseAsync( + Expression> expression, + Expression> expression1, + Expression>> childListExpression, Expression> parentIdExpression, object rootValue, object[] childIds + ) + { + return await DbBaseClient + .Queryable() + .Where(expression) + .OrderBy(expression1, OrderByType.Asc) + .ToTreeAsync(childListExpression, parentIdExpression, rootValue, childIds); + } + /// /// 根据条件查询数据 @@ -330,6 +474,19 @@ public abstract class BaseRepository where T : class, new() .WithNoLockOrNot(blUseNoLock) .ToListAsync(); } + public async Task> QueryListByClauseAsync( + Expression> expression, + bool isWhere, Expression> whereIfExpression, + Expression> selectExpression + ) + { + return await DbBaseClient + .Queryable() + .Where(expression) + .WhereIF(isWhere, whereIfExpression) + .Select(selectExpression) + .ToListAsync(); + } /// /// 根据条件查询一定数量数据 @@ -440,6 +597,47 @@ public abstract class BaseRepository where T : class, new() .WithNoLockOrNot(blUseNoLock) .FirstAsync(predicate); } + public async Task> QueryByGroupByAsync( + Expression> expression, + Expression> expression2 + ) + { + return await DbBaseClient + .Queryable() + .GroupBy(expression) + .Select(expression2) + .ToListAsync(); + } + public async Task> QueryByClauseAsync(Expression> predicate, Expression> selectExpression, bool blUseNoLock = false) + { + return await DbBaseClient + .Queryable() + .Where(predicate) + .Select(selectExpression) + .WithNoLockOrNot(blUseNoLock) + .ToListAsync(); + } + + public async Task UpdateColumnsAsync( + T updateObj, + Expression> columns + ) + { + return await DbBaseClient + .Updateable(updateObj) + .UpdateColumns(columns) + .ExecuteCommandAsync(); + } + + + public async Task> QueryListByClauseAsync( + Expression> expression) + { + return await DbBaseClient + .Queryable() + .Where(expression) + .ToListAsync(); + } /// /// 根据条件查询数据 @@ -476,17 +674,120 @@ public abstract class BaseRepository where T : class, new() .WithNoLockOrNot(blUseNoLock) .FirstAsync(predicate); } + public async Task> QueryByOrderByClauseAsync + ( + Expression> expression, + Expression> expression1, + bool blUseNoLock = false) + { + return await DbBaseClient + .Queryable() + .Where(expression) + .OrderBy(expression1, OrderByType.Asc) + .WithNoLockOrNot(blUseNoLock) + .ToListAsync(); + } + public List QueryByClauseToList( + Expression> expression, Expression> expression2, + Expression> expression1, bool blUseNoLock = false) + { + return DbBaseClient + .Queryable() + .Where(expression) + .Where(expression2) + .OrderBy(expression1, OrderByType.Asc) + .WithNoLockOrNot(blUseNoLock) + .ToList(); + } + public List QueryByClauseToList(Expression> expression, Expression> expression2, bool blUseNoLock = false) + { + return DbBaseClient + .Queryable() + .Where(expression) + .Where(expression2) + .WithNoLockOrNot(blUseNoLock) + .ToList(); + } + public List QueryByClauseToList(Expression> expression, Expression> expression1, bool blUseNoLock = false) + { + return DbBaseClient + .Queryable() + .Where(expression) + .OrderBy(expression1, OrderByType.Asc) + .WithNoLockOrNot(blUseNoLock) + .ToList(); + } + public List QueryByClauseToList(Expression> expression) + { + return DbBaseClient + .Queryable() + .Where(expression) + .ToList(); + } + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public async Task> QueryByClauseAsync( + Expression> joinExpression, + Expression> whereExpression, + Expression> orderExpression, + Expression> selectExpression + ) + { + return await DbBaseClient + .Queryable() + .LeftJoin(joinExpression) + .Where(whereExpression) + .OrderBy(orderExpression, OrderByType.Asc) + .Select(selectExpression) + .ToListAsync(); + } + public async Task> QueryByClauseAsync( + Expression> joinExpression, + Expression> whereExpression, + bool isWhere, Expression> whereifExpression, + Expression> orderExpression, + Expression> selectExpression + ) + { + return await DbBaseClient + .Queryable() + .LeftJoin(joinExpression) + .Where(whereExpression) + .WhereIF(isWhere, whereifExpression) + .OrderBy(orderExpression, OrderByType.Asc) + .Select(selectExpression) + .ToListAsync(); + } /// /// 写入实体数据 /// /// 实体数据 /// - public int Insert(T entity) + public T Insert(T entity) { return DbBaseClient .Insertable(entity) - .ExecuteReturnIdentity(); + .ExecuteReturnEntity(); + } + + /// + /// 写入或者更新实体数据 + /// + /// 实体数据 + /// + public int InsertOrUpdate(T entity) + { + return DbBaseClient.Storageable(entity).ExecuteCommand(); } /// @@ -494,25 +795,30 @@ public abstract class BaseRepository where T : class, new() /// /// 实体数据 /// - public async Task InsertAsync(T entity) + public async Task InsertAsync(T entity) { return await DbBaseClient .Insertable(entity) - .ExecuteReturnIdentityAsync(); + .ExecuteReturnEntityAsync(); + } + public async Task InsertReturnEntityAsync(T entity) + { + return await DbBaseClient + .Insertable(entity) + .ExecuteReturnEntityAsync(); } - /// /// 写入实体数据 /// /// 实体数据 /// 插入的列 /// - public int Insert(T entity, Expression> insertColumns = null) + public T Insert(T entity, Expression> insertColumns = null) { var insert = DbBaseClient.Insertable(entity); if (insertColumns == null) - return insert.ExecuteReturnIdentity(); - return insert.InsertColumns(insertColumns).ExecuteReturnIdentity(); + return insert.ExecuteReturnEntity(); + return insert.InsertColumns(insertColumns).ExecuteReturnEntity(); } /// @@ -521,12 +827,12 @@ public abstract class BaseRepository where T : class, new() /// 实体数据 /// 插入的列 /// - public async Task InsertAsync(T entity, Expression> insertColumns = null) + public async Task InsertAsync(T entity, Expression> insertColumns = null) { var insert = DbBaseClient.Insertable(entity); if (insertColumns == null) - return await insert.ExecuteReturnIdentityAsync(); - return await insert.InsertColumns(insertColumns).ExecuteReturnIdentityAsync(); + return await insert.ExecuteReturnEntityAsync(); + return await insert.InsertColumns(insertColumns).ExecuteReturnEntityAsync(); } /// @@ -562,9 +868,10 @@ public abstract class BaseRepository where T : class, new() /// /// 实体类 /// - public int Insert(List entity) + public bool Insert(List entity) { - return DbBaseClient.Insertable(entity.ToArray()).ExecuteReturnIdentity(); + return DbBaseClient.Insertable(entity.ToArray()).ExecuteCommandIdentityIntoEntity(); + ; } /// @@ -572,9 +879,9 @@ public abstract class BaseRepository where T : class, new() /// /// 实体类 /// - public async Task InsertAsync(List entity) + public async Task InsertAsync(List entity) { - return await DbBaseClient.Insertable(entity.ToArray()).ExecuteCommandAsync(); + return await DbBaseClient.Insertable(entity.ToArray()).ExecuteCommandIdentityIntoEntityAsync(); } /// @@ -607,6 +914,64 @@ public abstract class BaseRepository where T : class, new() return await DbBaseClient.Updateable(entity).ExecuteCommandHasChangeAsync(); } + public async Task UpdateAsync( + Expression> expression + ) + { + return await DbBaseClient + .Queryable() + .ClearFilter() + .AnyAsync(expression); + } + + public int Update(Expression> columns, + Expression> expression) + { + return DbBaseClient.Updateable().SetColumns(columns).Where(expression).ExecuteCommand(); + } + + + public async Task UpdateAsync( + Expression> columns, + Expression> expression + ) + { + return await DbBaseClient + .Updateable() + .SetColumns(columns) + .Where(expression) + .ExecuteCommandAsync(); + } + + public async Task UpdateAsync( + Expression> columns + ) + { + return await DbBaseClient + .Updateable() + .IgnoreColumns(columns) + .ExecuteCommandAsync(); + } + public async Task UpdateAsync( + T updateObj, + bool ignoreAllNullColumns + ) + { + return await DbBaseClient + .Updateable(updateObj) + .IgnoreColumns(ignoreAllNullColumns) + .ExecuteCommandAsync(); + } + public async Task UpdateAsync( + T updateObj, bool ignoreAllNullColumns, Expression> columns + ) + { + return await DbBaseClient + .Updateable(updateObj) + .IgnoreColumns(ignoreAllNullColumns) + .IgnoreColumns(columns) + .ExecuteCommandAsync(); + } /// /// 更新实体数据 /// @@ -627,6 +992,7 @@ public abstract class BaseRepository where T : class, new() return await DbBaseClient.Updateable(entity).ExecuteCommandHasChangeAsync(); } + /// /// 根据手写条件更新 /// @@ -771,7 +1137,23 @@ public abstract class BaseRepository where T : class, new() { return await DbBaseClient.Deleteable(entity).ExecuteCommandHasChangeAsync(); } - + /// + /// 新增方法 + /// 该方法用于：根据角色Id删除用户角色 + /// + /// + /// + /// + /// + public async Task DeleteUserRoleByRoleId( + Expression> predicate, + Expression> selectExpression, Action action) + { + await DbBaseClient.Queryable() + .Where(predicate) + .Select(selectExpression) + .ForEachAsync(action); + } /// /// 删除数据 /// @@ -1097,7 +1479,26 @@ public abstract class BaseRepository where T : class, new() return await DbBaseClient.Queryable().Where(predicate).WithNoLockOrNot(blUseNoLock).SumAsync(field); } - + public async Task> QueryPageAsync( + Expression> whereExpression, + bool isWhere1, Expression> expression1, + bool isWhere2, Expression> expression2, + bool isWhere3, Expression> expression3, + Expression> orderBy, + int pageNumber, int pageSize, RefAsync totalNumber, + bool blUseNoLock = false) + { + var page = await DbBaseClient + .Queryable() + .Where(whereExpression) + .WhereIF(isWhere1, expression1) + .WhereIF(isWhere2, expression2) + .WhereIF(isWhere3, expression3) + .OrderBy(orderBy, OrderByType.Asc) + .WithNoLockOrNot(blUseNoLock) + .ToPageListAsync(pageNumber, pageSize, totalNumber); + return page; + } /// /// 查询-2表查询 @@ -1300,4 +1701,7 @@ public abstract class BaseRepository where T : class, new() var list = await DbBaseClient.SqlQueryable(sql).ToListAsync(); return list; } + + + } \ No newline at end of file diff --git a/Service/BaseServices.cs b/Service/BaseServices.cs index 53a4627..21cf940 100644 --- a/Service/BaseServices.cs +++ b/Service/BaseServices.cs @@ -289,7 +289,7 @@ public class BaseServices where T : class, new() /// /// 实体数据 /// - public int Insert(T entity) + public T Insert(T entity) { return BaseDal.Insert(entity); } @@ -299,7 +299,7 @@ public class BaseServices where T : class, new() /// /// 实体数据 /// - public async Task InsertAsync(T entity) + public async Task InsertAsync(T entity) { return await BaseDal.InsertAsync(entity); } @@ -310,7 +310,7 @@ public class BaseServices where T : class, new() /// 实体数据 /// 插入的列 /// - public int Insert(T entity, Expression> insertColumns = null) + public T Insert(T entity, Expression> insertColumns = null) { return BaseDal.Insert(entity, insertColumns); } @@ -321,7 +321,7 @@ public class BaseServices where T : class, new() /// 实体数据 /// 插入的列 /// - public async Task InsertAsync(T entity, Expression> insertColumns = null) + public async Task InsertAsync(T entity, Expression> insertColumns = null) { return await BaseDal.InsertAsync(entity, insertColumns); } @@ -353,7 +353,7 @@ public class BaseServices where T : class, new() /// /// 实体类 /// - public int Insert(List entity) + public bool Insert(List entity) { return BaseDal.Insert(entity); } @@ -363,7 +363,7 @@ public class BaseServices where T : class, new() /// /// 实体类 /// - public async Task InsertAsync(List entity) + public async Task InsertAsync(List entity) { return await BaseDal.InsertAsync(entity); } diff --git a/Service/System/SysBatteryReplaceLogServices.cs b/Service/System/SysBatteryReplaceLogServices.cs index 4986e3b..65a1d85 100644 --- a/Service/System/SysBatteryReplaceLogServices.cs +++ b/Service/System/SysBatteryReplaceLogServices.cs @@ -20,8 +20,8 @@ public class SysBatteryReplaceLogServices : BaseServices var result = false; if (_sysBatteryReplaceLog != null) { - var resuklt = _dal.Insert(_sysBatteryReplaceLog); - if (resuklt > 0) result = true; + _dal.Insert(_sysBatteryReplaceLog); + result = true; } return result; diff --git a/WebStarter/Properties/launchSettings.json b/WebStarter/Properties/launchSettings.json index b37c499..a2bd865 100644 --- a/WebStarter/Properties/launchSettings.json +++ b/WebStarter/Properties/launchSettings.json @@ -14,7 +14,7 @@ "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "http://localhost:5034", + "applicationUrl": "http://localhost:5036", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", "profiles_active": "dev" diff --git a/WebStarter/appsettings.dev.json b/WebStarter/appsettings.dev.json index 42adf99..beec6a2 100644 --- a/WebStarter/appsettings.dev.json +++ b/WebStarter/appsettings.dev.json @@ -26,7 +26,7 @@ "Kestrel": { "Endpoints": { "http": { - "Url": "http://*:15036" + "Url": "http://*:5036" } } }, diff --git a/WebStarter/bin/Debug/net6.0/Autofac.Extensions.DependencyInjection.dll b/WebStarter/bin/Debug/net6.0/Autofac.Extensions.DependencyInjection.dll deleted file mode 100644 index 75cfa26..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Autofac.Extensions.DependencyInjection.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Autofac.dll b/WebStarter/bin/Debug/net6.0/Autofac.dll deleted file mode 100644 index 09c885d..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Autofac.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DmProvider.dll b/WebStarter/bin/Debug/net6.0/DmProvider.dll deleted file mode 100644 index 88522ba..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DmProvider.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DotNetty.Buffers.dll b/WebStarter/bin/Debug/net6.0/DotNetty.Buffers.dll deleted file mode 100644 index b4cdd8d..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DotNetty.Buffers.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DotNetty.Codecs.Mqtt.dll b/WebStarter/bin/Debug/net6.0/DotNetty.Codecs.Mqtt.dll deleted file mode 100644 index 43fd19d..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DotNetty.Codecs.Mqtt.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DotNetty.Codecs.dll b/WebStarter/bin/Debug/net6.0/DotNetty.Codecs.dll deleted file mode 100644 index d5239eb..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DotNetty.Codecs.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DotNetty.Common.dll b/WebStarter/bin/Debug/net6.0/DotNetty.Common.dll deleted file mode 100644 index 992dccc..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DotNetty.Common.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DotNetty.Handlers.dll b/WebStarter/bin/Debug/net6.0/DotNetty.Handlers.dll deleted file mode 100644 index 072cab4..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DotNetty.Handlers.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/DotNetty.Transport.dll b/WebStarter/bin/Debug/net6.0/DotNetty.Transport.dll deleted file mode 100644 index 43257b3..0000000 Binary files a/WebStarter/bin/Debug/net6.0/DotNetty.Transport.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Kdbndp.dll b/WebStarter/bin/Debug/net6.0/Kdbndp.dll deleted file mode 100644 index 324cb0c..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Kdbndp.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Data.SqlClient.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Data.SqlClient.dll deleted file mode 100644 index 3114e92..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Data.SqlClient.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Data.Sqlite.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Data.Sqlite.dll deleted file mode 100644 index 282fdd8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Data.Sqlite.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll deleted file mode 100644 index 3a12ec4..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.FileExtensions.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.FileExtensions.dll deleted file mode 100644 index 9db3318..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.FileExtensions.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Json.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Json.dll deleted file mode 100644 index c97254c..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.Json.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.dll deleted file mode 100644 index 8baf931..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Configuration.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Abstractions.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Abstractions.dll deleted file mode 100644 index 897af44..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Abstractions.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Physical.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Physical.dll deleted file mode 100644 index 449d845..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileProviders.Physical.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileSystemGlobbing.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileSystemGlobbing.dll deleted file mode 100644 index 3881e49..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.FileSystemGlobbing.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll deleted file mode 100644 index a9b2783..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll deleted file mode 100644 index 081abea..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Extensions.Primitives.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Identity.Client.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Identity.Client.dll deleted file mode 100644 index c01fcbf..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Identity.Client.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll b/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll deleted file mode 100644 index 70b84f2..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.JsonWebTokens.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Logging.dll b/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Logging.dll deleted file mode 100644 index 7ecc3be..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Logging.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll b/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll deleted file mode 100644 index d925b5b..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Protocols.dll b/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Protocols.dll deleted file mode 100644 index 17423cc..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Protocols.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Tokens.dll b/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Tokens.dll deleted file mode 100644 index dd66624..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.IdentityModel.Tokens.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.OpenApi.dll b/WebStarter/bin/Debug/net6.0/Microsoft.OpenApi.dll deleted file mode 100644 index 14f3ded..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.OpenApi.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Microsoft.Win32.SystemEvents.dll b/WebStarter/bin/Debug/net6.0/Microsoft.Win32.SystemEvents.dll deleted file mode 100644 index 3ab5850..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Microsoft.Win32.SystemEvents.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/MySqlConnector.dll b/WebStarter/bin/Debug/net6.0/MySqlConnector.dll deleted file mode 100644 index 3cbe116..0000000 Binary files a/WebStarter/bin/Debug/net6.0/MySqlConnector.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Newtonsoft.Json.dll b/WebStarter/bin/Debug/net6.0/Newtonsoft.Json.dll deleted file mode 100644 index d035c38..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Newtonsoft.Json.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Npgsql.dll b/WebStarter/bin/Debug/net6.0/Npgsql.dll deleted file mode 100644 index 7b2d4a0..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Npgsql.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Oracle.ManagedDataAccess.dll b/WebStarter/bin/Debug/net6.0/Oracle.ManagedDataAccess.dll deleted file mode 100644 index fcdd395..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Oracle.ManagedDataAccess.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.batteries_v2.dll b/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.batteries_v2.dll deleted file mode 100644 index 48430f9..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.batteries_v2.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.core.dll b/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.core.dll deleted file mode 100644 index c1c3ed2..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.core.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll b/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll deleted file mode 100644 index ac4db32..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SQLitePCLRaw.provider.e_sqlite3.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SqlSugar.IOC.dll b/WebStarter/bin/Debug/net6.0/SqlSugar.IOC.dll deleted file mode 100644 index bdd674c..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SqlSugar.IOC.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SqlSugar.dll b/WebStarter/bin/Debug/net6.0/SqlSugar.dll deleted file mode 100644 index 5946740..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SqlSugar.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.Swagger.dll b/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.Swagger.dll deleted file mode 100644 index 39b68f8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.Swagger.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll b/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll deleted file mode 100644 index 47f3406..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.SwaggerGen.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll b/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll deleted file mode 100644 index 2628e9e..0000000 Binary files a/WebStarter/bin/Debug/net6.0/Swashbuckle.AspNetCore.SwaggerUI.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Configuration.ConfigurationManager.dll b/WebStarter/bin/Debug/net6.0/System.Configuration.ConfigurationManager.dll deleted file mode 100644 index d67c8a8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Configuration.ConfigurationManager.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Diagnostics.PerformanceCounter.dll b/WebStarter/bin/Debug/net6.0/System.Diagnostics.PerformanceCounter.dll deleted file mode 100644 index e6023b8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Diagnostics.PerformanceCounter.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.DirectoryServices.Protocols.dll b/WebStarter/bin/Debug/net6.0/System.DirectoryServices.Protocols.dll deleted file mode 100644 index f82bc91..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.DirectoryServices.Protocols.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.DirectoryServices.dll b/WebStarter/bin/Debug/net6.0/System.DirectoryServices.dll deleted file mode 100644 index e12cdf3..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.DirectoryServices.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Drawing.Common.dll b/WebStarter/bin/Debug/net6.0/System.Drawing.Common.dll deleted file mode 100644 index be6915e..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Drawing.Common.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.IdentityModel.Tokens.Jwt.dll b/WebStarter/bin/Debug/net6.0/System.IdentityModel.Tokens.Jwt.dll deleted file mode 100644 index efd3c61..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.IdentityModel.Tokens.Jwt.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Runtime.Caching.dll b/WebStarter/bin/Debug/net6.0/System.Runtime.Caching.dll deleted file mode 100644 index 6fedfab..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Runtime.Caching.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Security.Cryptography.ProtectedData.dll b/WebStarter/bin/Debug/net6.0/System.Security.Cryptography.ProtectedData.dll deleted file mode 100644 index 1ba8770..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Security.Cryptography.ProtectedData.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Security.Permissions.dll b/WebStarter/bin/Debug/net6.0/System.Security.Permissions.dll deleted file mode 100644 index 39dd4df..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Security.Permissions.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Text.Encodings.Web.dll b/WebStarter/bin/Debug/net6.0/System.Text.Encodings.Web.dll deleted file mode 100644 index 13a219a..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Text.Encodings.Web.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Text.Json.dll b/WebStarter/bin/Debug/net6.0/System.Text.Json.dll deleted file mode 100644 index 2078226..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Text.Json.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/System.Windows.Extensions.dll b/WebStarter/bin/Debug/net6.0/System.Windows.Extensions.dll deleted file mode 100644 index c3e8844..0000000 Binary files a/WebStarter/bin/Debug/net6.0/System.Windows.Extensions.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/WebStarter.runtimeconfig.json b/WebStarter/bin/Debug/net6.0/WebStarter.runtimeconfig.json deleted file mode 100644 index dfb1b77..0000000 --- a/WebStarter/bin/Debug/net6.0/WebStarter.runtimeconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net6.0", - "frameworks": [ - { - "name": "Microsoft.NETCore.App", - "version": "6.0.0" - }, - { - "name": "Microsoft.AspNetCore.App", - "version": "6.0.0" - } - ], - "configProperties": { - "System.GC.Server": true, - "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false - } - } -} \ No newline at end of file diff --git a/WebStarter/bin/Debug/net6.0/appsettings.Development.json b/WebStarter/bin/Debug/net6.0/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/WebStarter/bin/Debug/net6.0/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/WebStarter/bin/Debug/net6.0/log4net.config b/WebStarter/bin/Debug/net6.0/log4net.config deleted file mode 100644 index c533256..0000000 --- a/WebStarter/bin/Debug/net6.0/log4net.config +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WebStarter/bin/Debug/net6.0/log4net.dll b/WebStarter/bin/Debug/net6.0/log4net.dll deleted file mode 100644 index 9b6871b..0000000 Binary files a/WebStarter/bin/Debug/net6.0/log4net.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/alpine-arm/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/alpine-arm/native/libe_sqlite3.so deleted file mode 100644 index 2c24486..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/alpine-arm/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/alpine-arm64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/alpine-arm64/native/libe_sqlite3.so deleted file mode 100644 index 079c8af..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/alpine-arm64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/alpine-x64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/alpine-x64/native/libe_sqlite3.so deleted file mode 100644 index be7aba8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/alpine-x64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a b/WebStarter/bin/Debug/net6.0/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a deleted file mode 100644 index a8c038f..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll b/WebStarter/bin/Debug/net6.0/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll deleted file mode 100644 index de065f6..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-arm/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-arm/native/libe_sqlite3.so deleted file mode 100644 index c24441c..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-arm/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-arm64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-arm64/native/libe_sqlite3.so deleted file mode 100644 index a336011..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-arm64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-armel/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-armel/native/libe_sqlite3.so deleted file mode 100644 index 2f29939..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-armel/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-mips64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-mips64/native/libe_sqlite3.so deleted file mode 100644 index 4199492..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-mips64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-arm/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-arm/native/libe_sqlite3.so deleted file mode 100644 index 2c24486..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-arm/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-arm64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-arm64/native/libe_sqlite3.so deleted file mode 100644 index 079c8af..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-arm64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-x64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-x64/native/libe_sqlite3.so deleted file mode 100644 index be7aba8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-musl-x64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-ppc64le/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-ppc64le/native/libe_sqlite3.so deleted file mode 100644 index 1977f82..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-ppc64le/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-s390x/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-s390x/native/libe_sqlite3.so deleted file mode 100644 index abe4596..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-s390x/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-x64/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-x64/native/libe_sqlite3.so deleted file mode 100644 index 62b48e9..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-x64/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux-x86/native/libe_sqlite3.so b/WebStarter/bin/Debug/net6.0/runtimes/linux-x86/native/libe_sqlite3.so deleted file mode 100644 index e64474d..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux-x86/native/libe_sqlite3.so and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/linux/lib/net6.0/System.DirectoryServices.Protocols.dll b/WebStarter/bin/Debug/net6.0/runtimes/linux/lib/net6.0/System.DirectoryServices.Protocols.dll deleted file mode 100644 index a274287..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/linux/lib/net6.0/System.DirectoryServices.Protocols.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib b/WebStarter/bin/Debug/net6.0/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib deleted file mode 100644 index 2112503..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/maccatalyst-arm64/native/libe_sqlite3.dylib and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib b/WebStarter/bin/Debug/net6.0/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib deleted file mode 100644 index 24653e2..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/maccatalyst-x64/native/libe_sqlite3.dylib and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/osx-arm64/native/libe_sqlite3.dylib b/WebStarter/bin/Debug/net6.0/runtimes/osx-arm64/native/libe_sqlite3.dylib deleted file mode 100644 index 04875eb..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/osx-arm64/native/libe_sqlite3.dylib and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/osx-x64/native/libe_sqlite3.dylib b/WebStarter/bin/Debug/net6.0/runtimes/osx-x64/native/libe_sqlite3.dylib deleted file mode 100644 index 215a8d6..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/osx-x64/native/libe_sqlite3.dylib and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/osx/lib/net6.0/System.DirectoryServices.Protocols.dll b/WebStarter/bin/Debug/net6.0/runtimes/osx/lib/net6.0/System.DirectoryServices.Protocols.dll deleted file mode 100644 index c14a840..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/osx/lib/net6.0/System.DirectoryServices.Protocols.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/unix/lib/net6.0/System.Drawing.Common.dll b/WebStarter/bin/Debug/net6.0/runtimes/unix/lib/net6.0/System.Drawing.Common.dll deleted file mode 100644 index 9e26473..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/unix/lib/net6.0/System.Drawing.Common.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/unix/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll b/WebStarter/bin/Debug/net6.0/runtimes/unix/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll deleted file mode 100644 index 231e75a..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/unix/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-arm/native/Microsoft.Data.SqlClient.SNI.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-arm/native/Microsoft.Data.SqlClient.SNI.dll deleted file mode 100644 index 3068646..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-arm/native/Microsoft.Data.SqlClient.SNI.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-arm/native/e_sqlite3.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-arm/native/e_sqlite3.dll deleted file mode 100644 index 4c4e4e1..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-arm/native/e_sqlite3.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-arm64/native/Microsoft.Data.SqlClient.SNI.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-arm64/native/Microsoft.Data.SqlClient.SNI.dll deleted file mode 100644 index 965f535..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-arm64/native/Microsoft.Data.SqlClient.SNI.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-arm64/native/e_sqlite3.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-arm64/native/e_sqlite3.dll deleted file mode 100644 index 0630a2d..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-arm64/native/e_sqlite3.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll deleted file mode 100644 index 227b87b..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-x64/native/Microsoft.Data.SqlClient.SNI.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-x64/native/e_sqlite3.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-x64/native/e_sqlite3.dll deleted file mode 100644 index df1e054..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-x64/native/e_sqlite3.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-x86/native/Microsoft.Data.SqlClient.SNI.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-x86/native/Microsoft.Data.SqlClient.SNI.dll deleted file mode 100644 index 0add8c2..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-x86/native/Microsoft.Data.SqlClient.SNI.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win-x86/native/e_sqlite3.dll b/WebStarter/bin/Debug/net6.0/runtimes/win-x86/native/e_sqlite3.dll deleted file mode 100644 index cda8bbd..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win-x86/native/e_sqlite3.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll deleted file mode 100644 index 66af198..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Diagnostics.PerformanceCounter.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Diagnostics.PerformanceCounter.dll deleted file mode 100644 index 0846bc0..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Diagnostics.PerformanceCounter.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.DirectoryServices.Protocols.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.DirectoryServices.Protocols.dll deleted file mode 100644 index 3ebf5d8..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.DirectoryServices.Protocols.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.DirectoryServices.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.DirectoryServices.dll deleted file mode 100644 index 6739958..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.DirectoryServices.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Drawing.Common.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Drawing.Common.dll deleted file mode 100644 index 7c9e87b..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Drawing.Common.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Security.Cryptography.ProtectedData.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Security.Cryptography.ProtectedData.dll deleted file mode 100644 index 332dbfa..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Security.Cryptography.ProtectedData.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Windows.Extensions.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Windows.Extensions.dll deleted file mode 100644 index 69f0d1b..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/net6.0/System.Windows.Extensions.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll deleted file mode 100644 index 0269777..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/netcoreapp3.1/Microsoft.Data.SqlClient.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/netstandard2.0/System.Runtime.Caching.dll b/WebStarter/bin/Debug/net6.0/runtimes/win/lib/netstandard2.0/System.Runtime.Caching.dll deleted file mode 100644 index 175d085..0000000 Binary files a/WebStarter/bin/Debug/net6.0/runtimes/win/lib/netstandard2.0/System.Runtime.Caching.dll and /dev/null differ diff --git a/WebStarter/obj/Debug/net6.0/WebStarter.csproj.CopyComplete b/WebStarter/obj/Debug/net6.0/WebStarter.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/WebStarter/obj/Debug/net6.0/staticwebassets.build.json b/WebStarter/obj/Debug/net6.0/staticwebassets.build.json deleted file mode 100644 index 309b0b1..0000000 --- a/WebStarter/obj/Debug/net6.0/staticwebassets.build.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Version": 1, - "Hash": "7euZr+Skxn+CPwHhQ3H6LZuur9IzJqC+CYg6oY75X7A=", - "Source": "WebStarter", - "BasePath": "_content/WebStarter", - "Mode": "Default", - "ManifestType": "Build", - "ReferencedProjectsConfiguration": [], - "DiscoveryPatterns": [], - "Assets": [] -} \ No newline at end of file