Merge branch 'dev/snow' of https://github.com/dotnetcore/osharp into dev/snow

Author: gmf520

samples/web/Liuliu.Demo.WebApi/Startups/MySqlDefaultDbContextMigrationPack.cs

@@ -6,7 +6,7 @@
 //  <last-editor>郭明锋</last-editor>
 //  <last-date>2018-08-13 20:35</last-date>
 // -----------------------------------------------------------------------
-#if NET6_0
+
 using System;
 using System.ComponentModel;
 
@@ -45,5 +45,4 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
             return new DesignTimeDefaultDbContextFactory(scopedProvider).CreateDbContext(new string[0]);
         }
     }
-}
-#endif
+}

samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs

@@ -7,7 +7,6 @@
 //  <last-date>2019-04-18 20:57</last-date>
 // -----------------------------------------------------------------------
 
-#if NET6_0
 
 using System;
 using System.ComponentModel;
@@ -47,5 +46,4 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
             return new DesignTimeDefaultDbContextFactory(scopedProvider).CreateDbContext(new string[0]);
         }
     }
-}
-#endif
+}

src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj

@@ -4,7 +4,7 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageId>OSharp.EntityFrameworkCore.Oracle</PackageId>
     <Description>OSharp 数据访问组件，封装EntityFrameworkCore的Oracle数据访问功能的实现</Description>
     <Summary>OSharp 数据访问组件Oracle</Summary>
@@ -17,6 +17,9 @@
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
     <PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.11, 8.0.0)" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
+    <PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.8, 8.0.0)" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
   </ItemGroup>

src/OSharp/Authorization/EntityInfos/EntityInfoBase.cs

@@ -36,7 +36,7 @@ public abstract class EntityInfoBase : EntityBase<long>, IEntityInfo
     /// <summary>
     /// 获取或设置 实体属性信息JSON字符串
     /// </summary>
-    [DisplayName("实体属性信息Json字符串"), Required, StringLength(5000)]
+    [DisplayName("实体属性信息Json字符串"), Required]
     public string PropertyJson { get; set; }
 
     /// <summary>